[X2Go-Commits] x2gobroker.git - uccsoutput (branch) updated: 0.0.1.0-34-gac6024e
X2Go dev team
git-admin at x2go.org
Wed Apr 10 11:49:13 CEST 2013
The branch, uccsoutput has been updated
via ac6024e007f2a0f5a63d82513a7370c72378925a (commit)
from bf62865e24d79f1c697c2ff2d353c52001e41041 (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 -----------------------------------------------------------------
commit ac6024e007f2a0f5a63d82513a7370c72378925a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Apr 10 11:49:00 2013 +0200
fix creation of x2gobroker's home dir
-----------------------------------------------------------------------
Summary of changes:
debian/x2gobroker-agent.postinst | 8 +++++---
debian/x2gobroker-daemon.postinst | 8 +++++---
debian/x2gobroker-wsgi.postinst | 10 ++++++----
3 files changed, 16 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst
index a9c761b..8f48ccd 100755
--- a/debian/x2gobroker-agent.postinst
+++ b/debian/x2gobroker-agent.postinst
@@ -38,16 +38,18 @@ case "$1" in
--shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker
else
echo "User x2gobroker already exists." 1>&2
+
+ # make sure the home directory exists belongs to x2gobroker:x2gobroker
+ mkdir -p /var/lib/x2gobroker
+ chown x2gobroker:x2gobroker /var/lib/x2gobroker -f
+
# make sure all settings are appropriate
if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
- mkdir -p /var/lib/x2gobroker
usermod --home /var/lib/x2gobroker x2gobroker
fi
if getent passwd x2gobroker | grep /bin/false 1>/dev/null 2>/dev/null; then
usermod --shell /bin/bash x2gobroker
fi
- # make sure the home directory belongs to x2gouser:x2gouser
- chown x2gobroker:x2gobroker /var/lib/x2gobroker -Rf
fi
# the x2gobroker-agent has to be installed setuid root
diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst
index cc5fb54..873b123 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -38,16 +38,18 @@ case "$1" in
--shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker
else
echo "User x2gobroker already exists." 1>&2
+
+ # make sure the home directory exists belongs to x2gobroker:x2gobroker
+ mkdir -p /var/lib/x2gobroker
+ chown x2gobroker:x2gobroker /var/lib/x2gobroker -f
+
# make sure all settings are appropriate
if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
- mkdir -p /var/lib/x2gobroker
usermod --home /var/lib/x2gobroker x2gobroker
fi
if getent passwd x2gobroker | grep /bin/false 1>/dev/null 2>/dev/null; then
usermod --shell /bin/bash x2gobroker
fi
- # make sure the home directory belongs to x2gouser:x2gouser
- chown x2gobroker:x2gobroker /var/lib/x2gobroker -Rf
fi
# the x2gobroker-daemon needs special permissions on its log directory
diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-wsgi.postinst
index cc5fb54..57db5bf 100755
--- a/debian/x2gobroker-wsgi.postinst
+++ b/debian/x2gobroker-wsgi.postinst
@@ -3,7 +3,7 @@
#
# see: dh_installdeb(1)
-set -e
+set -xe
# Source debconf library.
. /usr/share/debconf/confmodule
@@ -38,16 +38,18 @@ case "$1" in
--shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker
else
echo "User x2gobroker already exists." 1>&2
+
+ # make sure the home directory exists belongs to x2gobroker:x2gobroker
+ mkdir -p /var/lib/x2gobroker
+ chown x2gobroker:x2gobroker /var/lib/x2gobroker -f
+
# make sure all settings are appropriate
if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
- mkdir -p /var/lib/x2gobroker
usermod --home /var/lib/x2gobroker x2gobroker
fi
if getent passwd x2gobroker | grep /bin/false 1>/dev/null 2>/dev/null; then
usermod --shell /bin/bash x2gobroker
fi
- # make sure the home directory belongs to x2gouser:x2gouser
- chown x2gobroker:x2gobroker /var/lib/x2gobroker -Rf
fi
# the x2gobroker-daemon needs special permissions on its log directory
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