[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.0.0-2-ga21e0dc
X2go dev team
git-admin at x2go.org
Fri Feb 24 22:08:31 CET 2012
The branch, master has been updated
via a21e0dc286c89e94790fe13de7a083cf8be5f5b9 (commit)
from dd4e3c8884977e33ca053a93bb80b0a3102fc557 (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 a21e0dc286c89e94790fe13de7a083cf8be5f5b9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Feb 24 22:08:27 2012 +0100
Provide infrastructure for on-logout script calls.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 ++-
debian/x2goserver.install | 3 +--
x2goserver/bin/x2goterminate-session | 3 +++
x2goserver/etc/x2go_logout | 11 +++++++++++
x2goserver/etc/x2go_logout.d/010_userscripts.sh | 3 +++
5 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 x2goserver/etc/x2go_logout
create mode 100644 x2goserver/etc/x2go_logout.d/010_userscripts.sh
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d08a77f..aa623c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (3.1.0.1):
+ - Provide infrastructure for on-logout script calls.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index ea91840..a1fb231 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -1,8 +1,7 @@
x2goserver/bin/x2go* /usr/bin/
x2goserver/sbin/x2go* /usr/sbin/
x2goserver/lib/x2go* /usr/lib/x2go/
-x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/
-x2goserver/etc/x2goserver.conf /etc/x2go/
+x2goserver/etc/*
x2goserver/VERSION.x2goserver /usr/share/x2go/versions/
x2goserver/x2gosqlitewrapper /usr/lib/x2go/
x2goserver/share/x2gofeature.d /usr/share/x2go/
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 271f714..8743d7d 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -63,6 +63,9 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
export HOSTNAME
x2goumount-session "$SESSION_NAME"
+# run logout scripts
+test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout
+
# if we are not running in log level debug (=7) then clean up session dir
if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then
(sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout
new file mode 100644
index 0000000..b32fde1
--- /dev/null
+++ b/x2goserver/etc/x2go_logout
@@ -0,0 +1,11 @@
+# /etc/x2go/x2go_logout: system-wide .x2go_logout file for X2Go sessions
+# for Bash and Bash compatible shells (bash(1), ksh(1), ash(1), ...).
+
+if [ -d /etc/x2go/x2go_logout.d ]; then
+ for subscript in /etc/x2go_logout.d/*; do
+ if [ -r $subscript ]; then
+ . $subscript
+ fi
+ done
+ unset subscript
+fi
diff --git a/x2goserver/etc/x2go_logout.d/010_userscripts.sh b/x2goserver/etc/x2go_logout.d/010_userscripts.sh
new file mode 100644
index 0000000..5ba1edf
--- /dev/null
+++ b/x2goserver/etc/x2go_logout.d/010_userscripts.sh
@@ -0,0 +1,3 @@
+# call $HOME/.x2go_logout script...
+
+test -r $HOME/.x2go_logout && . $HOME/.x2go_logout
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list