[debian-edu-commits] debian-edu/pkg-team/ 126/159: decouple xrdp and sesman; move xrdp run dir to former; run xrdp as user

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 17dad9ca49624b47b1b8fdac189507fdf3de2438
Author: Dominik George <dominik.george at teckids.org>
Date:   Tue Sep 1 17:57:52 2015 +0200

    decouple xrdp and sesman; move xrdp run dir to former; run xrdp as user
---
 patches/systemd.diff | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/patches/systemd.diff b/patches/systemd.diff
index b8370cd..fb3beb5 100644
--- a/patches/systemd.diff
+++ b/patches/systemd.diff
@@ -2,11 +2,11 @@
 
 --- a/instfiles/xrdp-sesman.service
 +++ b/instfiles/xrdp-sesman.service
-@@ -1,14 +1,17 @@
+@@ -1,14 +1,13 @@
  [Unit]
 -Description=xrdp session manager
 -After=syslog.target network.target
-+Description=Remote Desktop Protocol (RDP) server - Session Manager
++Description=Remote Desktop Protocol (RDP) session manager
 +After=network.target
  StopWhenUnneeded=true
  BindTo=xrdp.service
@@ -17,11 +17,7 @@
 -EnvironmentFile=/etc/sysconfig/xrdp
 -ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
 +Type=simple
-+PIDFile=/var/run/xrdp/xrdp-sesman.pid
 +EnvironmentFile=/etc/default/xrdp
-+RuntimeDirectory=xrdp
-+RuntimeDirectoryMode=0775
-+Group=xrdp
 +ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --nodaemon
  ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
  
@@ -31,10 +27,10 @@
 @@ -1,12 +1,15 @@
  [Unit]
 -Description=xrdp daemon
-+Description=Remote Desktop Protocol (RDP) server
- Requires=xrdp-sesman.service
+-Requires=xrdp-sesman.service
 -After=syslog.target network.target xrdp-sesman.service
-+After=network.target xrdp-sesman.service
++Description=Remote Desktop Protocol (RDP) server
++After=network.target
  
  [Service]
 -Type=forking
@@ -44,7 +40,8 @@
 +PIDFile=/var/run/xrdp/xrdp.pid
 +EnvironmentFile=/etc/default/xrdp
 +RuntimeDirectory=xrdp
-+RuntimeDirectoryMode=0775
++RuntimeDirectoryMode=0755
++User=xrdp
 +Group=xrdp
  ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
  ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git