summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2018-06-14 16:04:02 +0900
committerKoichiro IWAO <meta@vmeta.jp>2018-06-16 16:44:37 +0900
commit6fb18cd5faa82013de8dcc39ffb67eb614681394 (patch)
tree98dd825457c04c5f6ce71991a985669041625a92
parenta39b4137463841c364f8a08d8b9b28fc80a69739 (diff)
downloadxrdp-proprietary-6fb18cd5faa82013de8dcc39ffb67eb614681394.tar.gz
xrdp-proprietary-6fb18cd5faa82013de8dcc39ffb67eb614681394.zip
docs: document configurable reconnect script path
-rw-r--r--docs/man/Makefile.am3
-rw-r--r--docs/man/sesman.ini.5.in15
-rw-r--r--sesman/sesman.ini.in5
3 files changed, 19 insertions, 4 deletions
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 841e13e1..f138673d 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -17,7 +17,8 @@ SUBST_VARS = sed \
-e 's|@bindir[@]|$(bindir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
- -e 's|@socketdir[@]|$(socketdir)|g'
+ -e 's|@socketdir[@]|$(socketdir)|g' \
+ -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g'
subst_verbose = $(subst_verbose_@AM_V@)
subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
diff --git a/docs/man/sesman.ini.5.in b/docs/man/sesman.ini.5.in
index 9cd05932..4fad8eb4 100644
--- a/docs/man/sesman.ini.5.in
+++ b/docs/man/sesman.ini.5.in
@@ -62,14 +62,23 @@ specified by \fBUserWindowManager\fR if it exists.
.TP
\fBUserWindowManager\fR=\fIfilename\fR
-Name of the startup script relative to the user's home directory. If
+Path of the startup script relative to the user's home directory. If
present and enabled by \fBEnableUserWindowManager\fR, that script is
executed instead of \fBDefaultWindowManager\fR.
.TP
\fBDefaultWindowManager\fR=\fIfilename\fR
-Full path to the default startup script used by xrdp-sesman to start a
-session if the user script is disabled or missing.
+Full path or relative path of the default startup script used by xrdp-sesman
+to start a session. If the path is not a full path, it will be resolved as
+relative path to \fI@xrdpconfdir@\fR. If not specified, defaults to
+\fI@xrdpconfdir@/startwm.sh\fR.
+
+.TP
+\fBReconnectScript\fR=\fIfilename\fR
+Full path or relative path if the script which executed when users reconnects
+to the existing session. If the path is not a full path, it will be resolved as
+relative path to \fI@xrdpconfdir@\fR. If not specified, defaults to
+\fI@xrdpconfdir@/reconnectwm.sh\fR.
.SH "LOGGING"
Following parameters can be used in the \fB[Logging]\fR section.
diff --git a/sesman/sesman.ini.in b/sesman/sesman.ini.in
index f3cdc7f7..68ef7795 100644
--- a/sesman/sesman.ini.in
+++ b/sesman/sesman.ini.in
@@ -1,9 +1,14 @@
+;; See `man 5 sesman.ini` for details
+
[Globals]
ListenAddress=127.0.0.1
ListenPort=3350
EnableUserWindowManager=true
+; Give in relative path to user's home directory
UserWindowManager=startwm.sh
+; Give in full path or relative path to @sesmansysconfdir@
DefaultWindowManager=startwm.sh
+; Give in full path or relative path to @sesmansysconfdir@
ReconnectScript=reconnectwm.sh
[Security]