Merge pull request #3368 from metalefty/sysconfsubdir

Allow to change config file (sub)directory
2024-12-29 11:00:16 +09:00
parent 4c8c7731f2 7db81f8471
commit 4e378c9a91
31 changed files with 47 additions and 36 deletions
@@ -25,6 +25,7 @@ SUBST_VARS = sed \
   -e 's|@sbindir[@]|$(sbindir)|g' \
   -e 's|@localstatedir[@]|$(localstatedir)|g' \
   -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+   -e 's|@sysconfsubdir[@]|$(sysconfsubdir)|g' \
   -e 's|@socketdir[@]|$(socketdir)|g' \
   -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' \
   -e 's|@xrdpdatadir[@]|$(datadir)/xrdp|g' \
@@ -440,7 +440,7 @@ All entries in the \fB[SessionVariables]\fR section are set as
 environment variables in the user's session.

 .SH "FILES"
-@sysconfdir@/xrdp/sesman.ini
+@sysconfdir@/@sysconfsubdir@/sesman.ini

 .SH "SEE ALSO"
 .BR xrdp-sesman (8),
@@ -40,7 +40,7 @@ X11 display number. Must be specified.

 .SH FILES
 .TP
-.I @sysconfdir@/xrdp/sesman.ini
+.I @sysconfdir@/@sysconfsubdir@/sesman.ini
 Contains some settings for this program.
 .TP
 .I @socketdir@/xrdp_chansrv_socket_*
@@ -41,7 +41,7 @@ The key map information is stored in the file named \fIoutfile\fP.

 .SH "FILES"
 .TP
-.I @sysconfdir@/xrdp/km-XXXXXXXX.toml
+.I @sysconfdir@/@sysconfsubdir@/km-XXXXXXXX.toml
 Files containing the keyboard mapping for country and language \fIXXXXXXXX\fP.
 \fIXXXXXXXX\fP is a 8 digit hexadecimal number, representing the \fIinput
 locale identifier\fP.
@@ -15,7 +15,7 @@ xrdp\-keygen \- xrdp RSA key generation utility

 .SH DESCRIPTION
 \fBxrdp\-keygen\fP generates the file
-.I @sysconfdir@/xrdp/rsakeys.ini
+.I @sysconfdir@/@sysconfsubdir@/rsakeys.ini
 which contains the RSA key pair used to perform authentication to
 remote clients. The public key is self-signed.

@@ -26,14 +26,14 @@ This program takes one of the following options:
 Generate a new key pair.
 The key data is stored in the file named \fIoutfile\fP.
 .br
-If \fBauto\fP is used as \fIoutfile\fP, the default file \fI@sysconfdir@/xrdp/rsakeys.ini\fP gets created if it does not yet exists.
+If \fBauto\fP is used as \fIoutfile\fP, the default file \fI@sysconfdir@/@sysconfsubdir@/rsakeys.ini\fP gets created if it does not yet exists.
 .TP
 .B test
 Generate a test key pair and print information to standard output.

 .SH FILES
 .TP
-.I @sysconfdir@/xrdp/rsakeys.ini
+.I @sysconfdir@/@sysconfsubdir@/rsakeys.ini
 RSA public and private key pair used to identify this XRDP server.

 .SH SEE ALSO
@@ -4,7 +4,7 @@
 \fBxrdp-km.toml\fR \- \fBxrdp\fP key mapping file

 .SH "DESCRIPTION"
-Key mapping files are located at \fB@sysconfdir@/xrdp/km-XXXXXXXX.toml\fP
+Key mapping files are located at \fB@sysconfdir@/@sysconfsubdir@/km-XXXXXXXX.toml\fP
 where \fBXXXXXXXX\fP is the input locale identifier sent by the RDP client.

 The key mapping files are used to translate RDP scan codes into one of
@@ -50,7 +50,7 @@ to be used primarily for testing or for unusual configurations.
 .P
 .RS
 If you use this option, be aware that you will have to have a
-\fB@sysconfdir@/xrdp/sesman.ini\fR in place too, as a few elements of
+\fB@sysconfdir@/@sysconfsubdir@/sesman.ini\fR in place too, as a few elements of
 the system (notably \fBxrdp(8)\fR and \fBxrdp\-chansrv(8)\fR) will want
 to read it.
 .RE
@@ -64,7 +64,7 @@ not running \fBxrdp\-sesman\fR as a daemon.
 .br
@bindir@/xrdp\-sesrun
 .br
-@sysconfdir@/xrdp/sesman.ini
+@sysconfdir@/sysconfsubdir@/sesman.ini
 .br
@localstatedir@/log/xrdp\-sesman.log
 .br
@@ -90,7 +90,7 @@ first. The \fBgnome\-terminal\fR utility probably won't work here.
 .br
@bindir@/xrdp\-sesrun
 .br
-@sysconfdir@/xrdp/sesman.ini
+@sysconfdir@/@sysconfsubdir@/sesman.ini

 .SH "AUTHORS"
 Jay Sorg <jsorg71@users.sourceforge.net>
@@ -57,7 +57,7 @@ to be used primarily for testing or for unusual configurations.
 .SH "FILES"
@sbindir@/xrdp
 .br
-@sysconfdir@/xrdp/xrdp.ini
+@sysconfdir@/@sysconfsubdir@/xrdp.ini
 .br
@localstatedir@/log/xrdp.log
 .br
@@ -50,7 +50,7 @@ If set to \fB1\fR, \fBtrue\fR or \fByes\fR this option enables compression of bu
 .TP
 \fBkey_file\fP=\fI/path/to/private_key\fP
 Set location of TLS certificate and private key. They must be written in PEM format.
-If not specified, defaults to \fB@sysconfdir@/xrdp/cert.pem\fP, \fB@sysconfdir@/xrdp/key.pem\fP.
+If not specified, defaults to \fB@sysconfdir@/@sysconfsubdir@/cert.pem\fP, \fB@sysconfdir@/@sysconfsubdir@/key.pem\fP.

 This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP.

@@ -440,7 +440,7 @@ password={base64}cGFzc3dvcmQhCg==
 .fi

 .SH "FILES"
-@sysconfdir@/xrdp/xrdp.ini
+@sysconfdir@/@sysconfsubdir@/xrdp.ini

 .SH "SEE ALSO"
 .BR xrdp (8),