Add default configuration files

Install some example files to make things more easily discoverable.

CMakeLists.txt

@@ -27,6 +27,7 @@ set(VERSION 1.10.80)
 set(RCVERSION 1,10,80,0)
 
 # Installation paths
+set(SYSCONF_DIR "${CMAKE_INSTALL_PREFIX}/etc")
 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
 set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
 set(MAN_DIR "${DATA_DIR}/man")

contrib/packages/deb/ubuntu-bionic/debian/rules

@@ -56,7 +56,8 @@ config-stamp: xorg-source-stamp
 	# Add here commands to configure the package.
 	cmake -G"Unix Makefiles" \
 		-DBUILD_STATIC=off \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DSYSCONF_DIR:PATH=/etc
 	(cd unix/xserver; \
 	export PIXMANINCDIR=/usr/include/pixman-1; \
 	autoreconf -fiv; \

contrib/packages/deb/ubuntu-xenial/debian/rules

@@ -57,7 +57,8 @@ config-stamp: xorg-source-stamp
 	# Add here commands to configure the package.
 	cmake -G"Unix Makefiles" \
 		-DBUILD_STATIC=off \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DSYSCONF_DIR:PATH=/etc
 	(cd unix/xserver; \
 	export PIXMANINCDIR=/usr/include/pixman-1; \
 	autoreconf -fiv; \

contrib/packages/rpm/el7/SPECS/tigervnc.spec

@@ -147,7 +147,8 @@ export CMAKE_EXE_LINKER_FLAGS=$LDFLAGS
 
 %{cmake} -G"Unix Makefiles" \
   -DBUILD_STATIC=off \
-  -DCMAKE_INSTALL_PREFIX=%{_prefix}
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+  -DSYSCONF_DIR=%{_sysconfdir}
 make %{?_smp_mflags}
 
 pushd unix/xserver
@@ -245,6 +246,8 @@ fi
 %files server
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/sysconfig/vncservers
+%config(noreplace) %{_sysconfdir}/tigervnc/vncserver-config-defaults
+%config(noreplace) %{_sysconfdir}/tigervnc/vncserver-config-mandatory
 %{_unitdir}/vncserver@.service
 %{_bindir}/x0vncserver
 %{_bindir}/vncserver

unix/CMakeLists.txt

@@ -2,7 +2,5 @@ add_subdirectory(tx)
 add_subdirectory(common)
 add_subdirectory(vncconfig)
 add_subdirectory(vncpasswd)
+add_subdirectory(vncserver)
 add_subdirectory(x0vncserver)
-
-install(PROGRAMS vncserver DESTINATION ${BIN_DIR})
-install(FILES vncserver.man DESTINATION ${MAN_DIR}/man1 RENAME vncserver.1)

unix/vncserver/CMakeLists.txt

@@ -0,0 +1,3 @@
+install(PROGRAMS vncserver DESTINATION ${BIN_DIR})
+install(FILES vncserver.man DESTINATION ${MAN_DIR}/man1 RENAME vncserver.1)
+install(FILES vncserver-config-defaults vncserver-config-mandatory DESTINATION ${SYSCONF_DIR}/tigervnc)

unix/vncserver/vncserver-config-defaults

@@ -0,0 +1,15 @@
+## Default settings for VNC servers started by the vncserver service
+#
+# Any settings given here will override the builtin defaults, but can
+# also be overriden by ~/.vnc/config and vncserver-config-mandatory.
+#
+# See the following manpages for more details: vncserver(1) Xvnc(1)
+#
+# Several common settings are shown below. Uncomment and modify to your
+# liking.
+
+# securitytypes=vncauth,tlsvnc
+# desktop=sandbox
+# geometry=2000x1200
+# localhost
+# alwaysshared

unix/vncserver/vncserver-config-mandatory

@@ -0,0 +1,15 @@
+## Mandatory settings for VNC servers started by the vncserver service
+#
+# Any settings given here will override the builtin defaults and
+# settings specified in ~/.vnc/config or vnc-config-defaults.
+#
+# See the following manpages for more details: vncserver(1) Xvnc(1)
+#
+# Several common settings are shown below. Uncomment and modify to your
+# liking.
+
+# securitytypes=vncauth,tlsvnc
+# desktop=sandbox
+# geometry=2000x1200
+# localhost
+# alwaysshared