Add default directory for debian, and set them optional

Remove the --nodaemon which makes the service fail at start
9 years ago · 4179589548
parent dbf959f5fa
commit 4179589548
2 changed files with 5 additions and 3 deletions
--- a/instfiles/xrdp-sesman.service
+++ b/instfiles/xrdp-sesman.service
@ -7,7 +7,8 @@ BindTo=xrdp.service
 [Service]
 Type=forking
 PIDFile=/var/run/xrdp-sesman.pid
-EnvironmentFile=/etc/sysconfig/xrdp
+EnvironmentFile=-/etc/sysconfig/xrdp
+EnvironmentFile=-/etc/default/xrdp
 ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
 ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill

--- a/instfiles/xrdp.service
+++ b/instfiles/xrdp.service
@ -6,8 +6,9 @@ After=syslog.target network.target xrdp-sesman.service
 [Service]
 Type=forking
 PIDFile=/var/run/xrdp.pid
-EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
+EnvironmentFile=-/etc/sysconfig/xrdp
+EnvironmentFile=-/etc/default/xrdp
+ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
 ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill

 [Install]