summaryrefslogtreecommitdiffstats
path: root/instfiles
diff options
context:
space:
mode:
authorItamar Reis Peixoto <itamar@ispbrasil.com.br>2015-10-14 08:40:53 -0400
committerItamar Reis Peixoto <itamar@ispbrasil.com.br>2015-10-14 08:40:53 -0400
commit5f16481feba464439896114986375a805d993e9b (patch)
tree2a3b95907b67d1ef338c2f2d1f380088bbd087b4 /instfiles
parent6f90e27d801c877233ae0ec37378bdbd1c603f84 (diff)
parent417958954826d55ae5ca6462ea3095b9cd72bedb (diff)
downloadxrdp-proprietary-5f16481feba464439896114986375a805d993e9b.tar.gz
xrdp-proprietary-5f16481feba464439896114986375a805d993e9b.zip
Merge pull request #267 from moobyfr/fix-systemd-debian
some fixes for systemd on debian
Diffstat (limited to 'instfiles')
-rw-r--r--instfiles/xrdp-sesman.service3
-rw-r--r--instfiles/xrdp.service5
2 files changed, 5 insertions, 3 deletions
diff --git a/instfiles/xrdp-sesman.service b/instfiles/xrdp-sesman.service
index 69882783..0ce9a4e5 100644
--- 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
diff --git a/instfiles/xrdp.service b/instfiles/xrdp.service
index 843500d6..fca4bd66 100644
--- 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]