[debian-edu-commits] debian-edu/pkg-team/ 50/159: add starting instructions, from manual we’ll then craft initscripts

[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 12033ee7c9499c225ae01194fc2467e40a58086b
Author: mirabilos <tg at mirbsd.org>
Date:   Thu Aug 6 21:00:29 2015 +0200

    add starting instructions, from manual we’ll then craft initscripts
---
 README.Debian       | 31 +++++++++++++++++++++++++++++++
 README.source       |  2 --
 changelog           |  3 ++-
 patches/config.diff | 29 +++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/README.Debian b/README.Debian
new file mode 100644
index 0000000..6744614
--- /dev/null
+++ b/README.Debian
@@ -0,0 +1,31 @@
+There is currently no init system integration.
+
+To start this, you have to approximately do the following
+(please submit actual methods, fixes, sysv-rc and systemd
+scripts, and possibly upstart and OpenRC scripts, to us):
+
+Initially:
+• review /etc/xrdp/xrdp.ini
+• review /etc/xrdp/sesman.ini
+• review /etc/X11/xrdp/xorg.conf
+
+To start, in order:
+• create /var/run/xrdp and chown it to xrdp:xrdp
+To start, in order (to stop, in reverse order):
+• start the xrdp dæmon as xrdp:xrdp
+• start the xrdp-sesman dæmon as superuser
+After stopping, sleep a bit to facilitate restarts.
+
+
+To start, do something similar to what follows, except, in
+what order (before? after? the above), as which user, etc.
+(probably as root) are currently unknowns:
+
+Xorg -config xrdp/xorg.conf -retro -noreset -ac :10
+
+The Wiki says thereto:
+| Use the "Session manager" entry in xrdp chooser at connection. The
+| main difference is the ''code=20'' which make usage of Xorg driver
+| instead of X11rdp
+So I think we do *not* need to start it manually, maybe?
+Please try without it at first!
diff --git a/README.source b/README.source
index 08a1938..422273d 100644
--- a/README.source
+++ b/README.source
@@ -3,8 +3,6 @@ TODO:
 - provide Debian init system integration
   * systemd
   * sysvinit
-    - Ensure that /var/run/xrdp is owned by xrdp:xrdp
-    - Sleep a bit after stopping so that xrdp can be restarted
     - Add an option in /etc/default/xrdp to avoid to restart on
       upgrade, thanks to a suggestion from Ola Lundqvist
 
diff --git a/changelog b/changelog
index f472617..68f5040 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ xrdp (0.9.0~git20150803-1~alpha2) teckids; urgency=medium
   * Use an xrdp user; tear it down on purge like old Debian package does
   * Tear down logfiles on postrm, like Debian
   * Remove old RSA keyfile from insecure versions, like Debian
+  * Add some instructions on starting, since we don’t have initscripts yet
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Thu, 06 Aug 2015 20:27:48 +0200
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Thu, 06 Aug 2015 21:00:08 +0200
 
 xrdp (0.9.0~git20150803-1~alpha1) teckids; urgency=medium
 
diff --git a/patches/config.diff b/patches/config.diff
index 4f80286..3b766b6 100644
--- a/patches/config.diff
+++ b/patches/config.diff
@@ -1,5 +1,15 @@
 # DP: config patches for Debian
 
+--- a/sesman/sesman.ini
++++ b/sesman/sesman.ini
+@@ -87,6 +87,7 @@ param5=-noreset
+ param6=-ac
+ param7=-nolisten
+ param8=tcp
++param9=-retro
+ 
+ [Chansrv]
+ # drive redirection, defaults to xrdp_client if not set
 --- a/xorgxrdp/xrdpdev/xorg.conf
 +++ b/xorgxrdp/xrdpdev/xorg.conf
 @@ -12,10 +12,9 @@ Section "ServerFlags"
@@ -16,3 +26,22 @@
  EndSection
  
  Section "Module"
+--- a/xrdp/xrdp.ini
++++ b/xrdp/xrdp.ini
+@@ -140,14 +140,14 @@ tcutils=true
+ # chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
+ 
+ [xrdp1]
+-name=sesman-X11rdp
++name=sesman-xorgxrdp
+ lib=libxup.so
+ username=ask
+ password=ask
+ ip=127.0.0.1
+ port=-1
+ xserverbpp=24
+-code=10
++code=20
+ 
+ [xrdp2]
+ name=sesman-Xvnc

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