diff options
| author | Blindauer Emmanuel <e.blindauer@gmail.com> | 2015-07-24 08:49:12 +0200 |
|---|---|---|
| committer | Blindauer Emmanuel <e.blindauer@gmail.com> | 2015-07-24 08:49:12 +0200 |
| commit | 417958954826d55ae5ca6462ea3095b9cd72bedb (patch) | |
| tree | 2d596390db2c40bbc5251a34ab27f34f6c81661f /instfiles | |
| parent | dbf959f5faed39792ad8241d169a50baf79215f5 (diff) | |
| download | xrdp-proprietary-417958954826d55ae5ca6462ea3095b9cd72bedb.tar.gz xrdp-proprietary-417958954826d55ae5ca6462ea3095b9cd72bedb.zip | |
Add default directory for debian, and set them optional
Remove the --nodaemon which makes the service fail at start
Diffstat (limited to 'instfiles')
| -rw-r--r-- | instfiles/xrdp-sesman.service | 3 | ||||
| -rw-r--r-- | instfiles/xrdp.service | 5 |
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] |