From: Koichiro IWAO Date: Wed, 16 Sep 2020 14:18:29 +0000 (+0900) Subject: Do not assume sysconfdir is always /etc X-Git-Tag: v1.11.90~102^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=02da591c560a499eedd5687177ec4f1583bca4d8;p=tigervnc.git Do not assume sysconfdir is always /etc Refer @CMAKE_INSTALL_FULL_SYSCONF@ instead. --- diff --git a/unix/vncserver/CMakeLists.txt b/unix/vncserver/CMakeLists.txt index eeb4b7b0..71d5feec 100644 --- a/unix/vncserver/CMakeLists.txt +++ b/unix/vncserver/CMakeLists.txt @@ -4,6 +4,7 @@ target_link_libraries(vncsession ${PAM_LIBS}) configure_file(vncserver@.service.in vncserver@.service @ONLY) configure_file(vncsession-start.in vncsession-start @ONLY) configure_file(vncserver.in vncserver @ONLY) +configure_file(vncsession.man.in vncsession.man @ONLY) install(TARGETS vncsession DESTINATION ${CMAKE_INSTALL_FULL_SBINDIR}) install(FILES tigervnc.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME tigervnc) diff --git a/unix/vncserver/vncsession.man b/unix/vncserver/vncsession.man deleted file mode 100644 index 21382093..00000000 --- a/unix/vncserver/vncsession.man +++ /dev/null @@ -1,75 +0,0 @@ -.TH vncsession 8 "" "TigerVNC" "Virtual Network Computing" -.SH NAME -vncsession \- start a VNC server -.SH SYNOPSIS -.B vncsession -.RI < username > -.RI <: display# > -.SH DESCRIPTION -.B vncsession -is used to start a VNC (Virtual Network Computing) desktop. -.B vncsession -performs all the necessary steps to create a new user session, run Xvnc with -appropriate options and starts a window manager on the VNC desktop. - -.B vncsession -is rarely called directly and is normally started by the system service -manager. - -.SH FILES -Several VNC-related files are found in the directory $HOME/.vnc: -.TP -/etc/tigervnc/vncserver-config-defaults -The optional system-wide equivalent of $HOME/.vnc/config. If this file exists -and defines options to be passed to Xvnc, they will be used as defaults for -users. The user's $HOME/.vnc/config overrides settings configured in this file. -The overall configuration file load order is: this file, $HOME/.vnc/config, -and then /etc/tigervnc/vncserver-config-mandatory. None are required to exist. -.TP -/etc/tigervnc/vncserver-config-mandatory -The optional system-wide equivalent of $HOME/.vnc/config. If this file exists -and defines options to be passed to Xvnc, they will override any of the same -options defined in a user's $HOME/.vnc/config. This file offers a mechanism -to establish some basic form of system-wide policy. WARNING! There is -nothing stopping users from constructing their own vncsession-like script -that calls Xvnc directly to bypass any options defined in -/etc/tigervnc/vncserver-config-mandatory. The overall configuration file load -order is: /etc/tigervnc/vncserver-config-defaults, $HOME/.vnc/config, and then -this file. None are required to exist. -.TP -$HOME/.vnc/config -An optional server config file wherein options to be passed to Xvnc are listed -to avoid hard-coding them to the physical invocation. List options in this file -one per line. For those requiring an argument, simply separate the option from -the argument with an equal sign, for example: "geometry=2000x1200" or -"securitytypes=vncauth,tlsvnc". Options without an argument are simply listed -as a single word, for example: "localhost" or "alwaysshared". - -The special option -.B session -can be used to control which session type will be started. This should match -one of the files in \fI/usr/share/xsessions\fP. E.g. if there is a file called -"gnome.desktop", then "session=gnome" would be set to use that session type. -.TP -$HOME/.vnc/passwd -The VNC password file. -.TP -$HOME/.vnc/\fIhost\fP:\fIdisplay#\fP.log -The log file for Xvnc and the session. - -.SH SEE ALSO -.BR vncviewer (1), -.BR vncpasswd (1), -.BR vncconfig (1), -.BR Xvnc (1) -.br -https://www.tigervnc.org - -.SH AUTHOR -Tristan Richardson, RealVNC Ltd., D. R. Commander and others. - -VNC was originally developed by the RealVNC team while at Olivetti -Research Ltd / AT&T Laboratories Cambridge. TightVNC additions were -implemented by Constantin Kaplinsky. Many other people have since -participated in development, testing and support. This manual is part -of the TigerVNC software suite. diff --git a/unix/vncserver/vncsession.man.in b/unix/vncserver/vncsession.man.in new file mode 100644 index 00000000..4efad41b --- /dev/null +++ b/unix/vncserver/vncsession.man.in @@ -0,0 +1,75 @@ +.TH vncsession 8 "" "TigerVNC" "Virtual Network Computing" +.SH NAME +vncsession \- start a VNC server +.SH SYNOPSIS +.B vncsession +.RI < username > +.RI <: display# > +.SH DESCRIPTION +.B vncsession +is used to start a VNC (Virtual Network Computing) desktop. +.B vncsession +performs all the necessary steps to create a new user session, run Xvnc with +appropriate options and starts a window manager on the VNC desktop. + +.B vncsession +is rarely called directly and is normally started by the system service +manager. + +.SH FILES +Several VNC-related files are found in the directory $HOME/.vnc: +.TP +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-defaults +The optional system-wide equivalent of $HOME/.vnc/config. If this file exists +and defines options to be passed to Xvnc, they will be used as defaults for +users. The user's $HOME/.vnc/config overrides settings configured in this file. +The overall configuration file load order is: this file, $HOME/.vnc/config, +and then @CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory. None are required to exist. +.TP +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory +The optional system-wide equivalent of $HOME/.vnc/config. If this file exists +and defines options to be passed to Xvnc, they will override any of the same +options defined in a user's $HOME/.vnc/config. This file offers a mechanism +to establish some basic form of system-wide policy. WARNING! There is +nothing stopping users from constructing their own vncsession-like script +that calls Xvnc directly to bypass any options defined in +@CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-mandatory. The overall configuration file load +order is: @CMAKE_INSTALL_FULL_SYSCONFDIR@/tigervnc/vncserver-config-defaults, $HOME/.vnc/config, and then +this file. None are required to exist. +.TP +$HOME/.vnc/config +An optional server config file wherein options to be passed to Xvnc are listed +to avoid hard-coding them to the physical invocation. List options in this file +one per line. For those requiring an argument, simply separate the option from +the argument with an equal sign, for example: "geometry=2000x1200" or +"securitytypes=vncauth,tlsvnc". Options without an argument are simply listed +as a single word, for example: "localhost" or "alwaysshared". + +The special option +.B session +can be used to control which session type will be started. This should match +one of the files in \fI/usr/share/xsessions\fP. E.g. if there is a file called +"gnome.desktop", then "session=gnome" would be set to use that session type. +.TP +$HOME/.vnc/passwd +The VNC password file. +.TP +$HOME/.vnc/\fIhost\fP:\fIdisplay#\fP.log +The log file for Xvnc and the session. + +.SH SEE ALSO +.BR vncviewer (1), +.BR vncpasswd (1), +.BR vncconfig (1), +.BR Xvnc (1) +.br +https://www.tigervnc.org + +.SH AUTHOR +Tristan Richardson, RealVNC Ltd., D. R. Commander and others. + +VNC was originally developed by the RealVNC team while at Olivetti +Research Ltd / AT&T Laboratories Cambridge. TightVNC additions were +implemented by Constantin Kaplinsky. Many other people have since +participated in development, testing and support. This manual is part +of the TigerVNC software suite.