[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-18-g43e490a

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:10 CEST 2013


The branch, build-main has been updated
       via  43e490a1fa111dde08d7b05d73fe144c3ca24b52 (commit)
      from  58da6a1d6504def84dccbc9f3328cca439fefa3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    2 ++
 debian/x2gobroker-daemon.init |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c7be8e3..179b474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
     - Make the daemon user ID configurable through x2gobroker-daemon.default.
     - Handle different situation for X2GOBROKER_DAEMON_USER. Make sure
       the getpass.getuser() function sees the correct effective UID.
+    - Make sure the unprivileged daemon user (x2gobroker) has access to the
+      PID file directory.
   * /debian/control:
     + Add bin:package x2gobroker-agent.
 
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index 789291b..2a5dd46 100755
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -19,8 +19,8 @@
 set -eu
 
 DAEMON=/usr/sbin/x2gobroker
-test -d /run && RUNDIR=/run/ || RUNDIR=/var/run
-PIDFILE=$RUNDIR/x2gobroker-daemon.pid
+test -d /run && RUNDIR=/run || RUNDIR=/var/run
+PIDFILE=$RUNDIR/x2gobroker/x2gobroker-daemon.pid
 DEBIANCONFIG=/etc/default/x2gobroker-daemon
 
 test -x "$DAEMON" || exit 0
@@ -41,6 +41,11 @@ if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then
 	X2GOBROKER_DAEMON_USER=nobody
 fi
 
+# create PID directory
+mkdir -p $RUNDIR/x2gobroker
+chown $X2GOBROKER_DAEMON_USER:nogroup $RUNDIR/x2gobroker
+chmod 0700 $RUNDIR/x2gobroker
+
 export LOGNAME=$X2GOBROKER_DAEMON_USER
 
 export X2GOBROKER_DEBUG


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list