summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2019-01-23 14:09:35 +0100
committerPierre Ossman <ossman@cendio.se>2020-03-12 09:48:17 +0100
commitebaa948e4685adce59e84242458fafb6f900bf0a (patch)
treee406d00e663c907198dff71f7e97400d0967ac10 /unix
parentbb8d82ad3c8ad7588217bdbcfa7fc5185bb3586a (diff)
downloadtigervnc-ebaa948e4685adce59e84242458fafb6f900bf0a.tar.gz
tigervnc-ebaa948e4685adce59e84242458fafb6f900bf0a.zip
Add default configuration files
Install some example files to make things more easily discoverable.
Diffstat (limited to 'unix')
-rw-r--r--unix/CMakeLists.txt4
-rw-r--r--unix/vncserver/CMakeLists.txt3
-rwxr-xr-xunix/vncserver/vncserver (renamed from unix/vncserver)0
-rw-r--r--unix/vncserver/vncserver-config-defaults15
-rw-r--r--unix/vncserver/vncserver-config-mandatory15
-rw-r--r--unix/vncserver/vncserver.man (renamed from unix/vncserver.man)0
6 files changed, 34 insertions, 3 deletions
diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
index 7a1457df..5456e00b 100644
--- a/unix/CMakeLists.txt
+++ b/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)
diff --git a/unix/vncserver/CMakeLists.txt b/unix/vncserver/CMakeLists.txt
new file mode 100644
index 00000000..66917866
--- /dev/null
+++ b/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)
diff --git a/unix/vncserver b/unix/vncserver/vncserver
index c98fb91f..c98fb91f 100755
--- a/unix/vncserver
+++ b/unix/vncserver/vncserver
diff --git a/unix/vncserver/vncserver-config-defaults b/unix/vncserver/vncserver-config-defaults
new file mode 100644
index 00000000..0c217bfe
--- /dev/null
+++ b/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
diff --git a/unix/vncserver/vncserver-config-mandatory b/unix/vncserver/vncserver-config-mandatory
new file mode 100644
index 00000000..98c32f60
--- /dev/null
+++ b/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
diff --git a/unix/vncserver.man b/unix/vncserver/vncserver.man
index 95f7960f..95f7960f 100644
--- a/unix/vncserver.man
+++ b/unix/vncserver/vncserver.man