The branch, build-main has been updated
via 6ab6f454d8976ab5c42937e44e81ab2bf570f9e6 (commit)
from e19494d1cf6fa3f04f946d50196c3a5123835ba2 (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:
x2gobroker/…
[View More]web/uccs.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index 3eeb622..7ad0060 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -50,13 +50,16 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
return self.post(backend)
raise tornado.web.HTTPError(404)
- def post(self, backend):
+ def head(self, backend):
if not backend:
backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND
else:
backend = backend.rstrip('/')
+ # get the first and the third item as backend, api_version
+ backend, api_version = backend.split('/')[:3:2]
+
# silence pyflakes...
broker_backend = None
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).
[View Less]
The branch, build-main has been updated
via e6bbdb5bb97de5ee01cd9e659ba43f1dde5c7376 (commit)
from 6ab6f454d8976ab5c42937e44e81ab2bf570f9e6 (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:
x2gobroker/…
[View More]web/uccs.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index 7ad0060..a17b3b9 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -47,7 +47,7 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
if x2gobroker.defaults.X2GOBROKER_DEBUG:
self._gen_http_header()
logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG')
- return self.post(backend)
+ return self.head(backend)
raise tornado.web.HTTPError(404)
def head(self, backend):
@@ -77,12 +77,6 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
if not broker_backend.is_enabled():
raise tornado.web.HTTPError(404)
- # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138)
- content_type = self.request.headers.get("Content-Type", "")
- if not content_type.startswith("application/x-www-form-urlencoded"):
- for name, values in parse_qs_bytes(native_str(self.request.body)).iteritems():
- self.request.arguments.setdefault(name, []).extend(values)
-
# set the client address for the broker backend
ip = self.request.remote_ip
if ip:
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).
[View Less]
The branch, build-main has been updated
via dc9eb932798d2679780d1343e1ab3ea4fa7386cc (commit)
from b487008f79052cc4da52e7e6093ff99a3d1a80af (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/…
[View More]changelog | 2 ++
debian/x2gobroker-agent.postrm | 2 +-
...gi.postinst => x2gobroker-authservice.postinst} | 5 +----
debian/x2gobroker-authservice.postrm | 8 ++++++++
debian/x2gobroker-daemon.postinst | 3 ---
debian/x2gobroker-daemon.postrm | 2 +-
debian/x2gobroker-wsgi.postrm | 2 +-
7 files changed, 14 insertions(+), 10 deletions(-)
copy debian/{x2gobroker-wsgi.postinst => x2gobroker-authservice.postinst} (95%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index adbbcd8..021f5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
* /debian/control:
+ Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
* Properly remove the X2Go Session broker log files on package purgal.
+ * Let bin:package x2gobroker-authservice create x2gouser:x2gouser, as well.
+ (Fixes: #171).
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index 8835e64..f5c6be0 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -30,7 +30,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (if not in use by x2gobroker-daemon
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-authservice.postinst
similarity index 95%
copy from debian/x2gobroker-wsgi.postinst
copy to debian/x2gobroker-authservice.postinst
index 873b123..52be4f9 100755
--- a/debian/x2gobroker-wsgi.postinst
+++ b/debian/x2gobroker-authservice.postinst
@@ -1,13 +1,10 @@
#!/bin/sh
-# postinst script for x2gobroker-daemon
+# postinst script for x2gobroker-authservice
#
# see: dh_installdeb(1)
set -e
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
diff --git a/debian/x2gobroker-authservice.postrm b/debian/x2gobroker-authservice.postrm
index 284e881..bf336f5 100755
--- a/debian/x2gobroker-authservice.postrm
+++ b/debian/x2gobroker-authservice.postrm
@@ -26,6 +26,14 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
+ getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ rm -Rf /var/lib/x2gobroker
+ fi
+
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst
index 873b123..9bc1d52 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -5,9 +5,6 @@
set -e
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index 3eba400..f4d0af9 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -26,7 +26,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm
index 9b2b170..9db9cfe 100755
--- a/debian/x2gobroker-wsgi.postrm
+++ b/debian/x2gobroker-wsgi.postrm
@@ -26,7 +26,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
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).
[View Less]
The branch, build-main has been updated
via e115d0666c21ebecd8c7c8549192ffe4bbf02071 (commit)
from 75f4cb8a59b9e8591aaed2f92dce4a6781ff8299 (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/…
[View More]control | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index 2425279..21554ca 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,7 @@ Depends:
python-argparse,
python-setproctitle,
python-tornado,
+ python-wsgilog,
python-x2gobroker (>= ${source:Version}), python-x2gobroker (<< ${source:Version}.1~),
Suggests:
apache2 | httpd,
@@ -154,7 +155,7 @@ Depends:
${python:Depends},
python,
adduser,
- python-wsgilog,
+ x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~),
Suggests:
apache2,
Description: X2Go http(s) based session broker (CGI)
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).
[View Less]
The branch, build-main has been updated
via b57e5c7d732c94056ded5046bd2f475074a3d933 (commit)
from ac6024e007f2a0f5a63d82513a7370c72378925a (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/…
[View More]x2gobroker-wsgi.postinst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-wsgi.postinst
index 57db5bf..873b123 100755
--- a/debian/x2gobroker-wsgi.postinst
+++ b/debian/x2gobroker-wsgi.postinst
@@ -3,7 +3,7 @@
#
# see: dh_installdeb(1)
-set -xe
+set -e
# Source debconf library.
. /usr/share/debconf/confmodule
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).
[View Less]
The branch, build-main has been updated
via 870b98422e7e2ceff6e2f2c5f90172e63109b75a (commit)
from 8546ee4fcd4c094b1a1a7a04ba81ed549055920e (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:
x2gobroker/…
[View More]authservice.py | 2 ++
1 file changed, 2 insertions(+)
The diff of changes is:
diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py
index fa7ce84..af47662 100644
--- a/x2gobroker/authservice.py
+++ b/x2gobroker/authservice.py
@@ -88,7 +88,9 @@ def loop():
def authenticate(username, password, service="x2gobroker"):
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ logger_authservice.debug('connecting to authentication service socket {socket}'.format(socket=X2GOBROKER_AUTHSERVICE_SOCKET))
s.connect(X2GOBROKER_AUTHSERVICE_SOCKET)
+ logger_authservice.debug('sending username={username}, password=<hidden>, service={service} to authentication service'.format(username=username, service=service))
s.send('{username} {password} {service}\n'.format(username=username, password=password, service=service))
result = s.recv(1024)
s.close()
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).
[View Less]
The branch, build-main has been updated
via 3fd14f204a2f570d88c95b455fdcffd57b99ed4e (commit)
from 870b98422e7e2ceff6e2f2c5f90172e63109b75a (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/…
[View More]changelog | 1 +
x2gobroker/authservice.py | 5 ++++-
x2gobroker/defaults.py | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a550fc2..0b12a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
- For sessions profiles with autologin enable, add a dummy key
session profile parameter that triggers key based auth in X2Go Client.
(Fixes: #154).
+ - Fix hard-coded path to x2gobroker's authservice socket.
* /debian/control:
+ Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
* Properly remove the X2Go Session broker log files on package purgal.
diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py
index af47662..bebc2ab 100644
--- a/x2gobroker/authservice.py
+++ b/x2gobroker/authservice.py
@@ -28,13 +28,16 @@ import socket
from pwd import getpwnam
from grp import getgrnam
+# set up the broker's environment
+import x2gobroker.defaults
+
from loggers import logger_authservice
logger_authservice.info('X2Go Session Broker PAM Authentication Service: Setting up the broker\'s environment...')
if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'):
X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET']
else:
- X2GOBROKER_AUTHSERVICE_SOCKET="/var/run/x2gobroker-authservice.socket"
+ X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket"
logger_authservice.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=X2GOBROKER_AUTHSERVICE_SOCKET))
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 9e61d83..7f1f3c8 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -77,7 +77,7 @@ else:
if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'):
X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET']
else:
- X2GOBROKER_AUTHSERVICE_SOCKET="/var/run/x2gobroker-authservice.socket"
+ X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket"
if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'):
X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND']
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).
[View Less]
The branch, build-main has been updated
via c09f1966fdde02156a5371b2a909b13b3620dc4f (commit)
from 5b884430d73643ab81fc0aac11f22e52be8706ee (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:
x2gobroker/…
[View More]web/uccs.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index 394583c..3eeb622 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -59,9 +59,15 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
# silence pyflakes...
broker_backend = None
- # dynamically detect broker backend from given URL
- exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend))
- exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
+
+ try:
+ # dynamically detect broker backend from given URL
+ exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend))
+ exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
+ except ImportError:
+ # throw a 404 if the backend does not exist
+ raise tornado.web.HTTPError(404)
+
global_config = broker_backend.get_global_config()
# if the broker backend is disabled in the configuration, pretend to have nothing on offer
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).
[View Less]
The branch, build-main has been updated
via 3366ab187d971a0de2bf2f13d33c02e24ce77ed5 (commit)
via 317325dd112ba89775ff81984ef985f061a81b21 (commit)
via 2cee942cb70599dd79ef3cf7f93fc2aeaa950472 (commit)
via 0beb6626be0dd1c9d0363435268def8df85f1380 (commit)
via d14d83a114d66019fe9fa031f3a367c65224cf6a (commit)
via 8130c9d12e3447fda3064b4b3f1ba0aef1015341 (commit)
via 00fb61c3429809f7511f7bda5667a77facd96918 (commit)
via …
[View More]e341bd86111730b2919697a74ac18d759d2a9e74 (commit)
via c9c92dbff6b4e9ee872eb738121dbd51da94d329 (commit)
via 1734e9987eebeaf7574c42c28b92f010fb827008 (commit)
via cd9500b7a1d12cd973af7726dbead83b79bc8581 (commit)
via 890debb62b31a29ed482d392e7d276c5d9936d90 (commit)
via aea8e30472982caf3be18c73e3175becfc6d6b4a (commit)
via 19582aa37e0e3cab202c43cd7497d791cbeee1b3 (commit)
from 87e0d33ee82cbbc48ff738d5fa33a49a7b9f904f (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:
The diff of changes is:
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).
[View Less]
The branch, build-main has been updated
via bf62865e24d79f1c697c2ff2d353c52001e41041 (commit)
from 3366ab187d971a0de2bf2f13d33c02e24ce77ed5 (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/…
[View More]changelog | 1 +
debian/x2gobroker-agent.postrm | 8 +++++---
debian/x2gobroker-daemon.postrm | 6 ++++--
debian/x2gobroker-wsgi.postrm | 6 ++++--
4 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 x2gobroker/tests/test_uccsjson.py
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4936e35..43e14a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
- Fix wrong usage of session option »cmd«, has to be »command«.
* /debian/control:
+ Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
+ * Properly remove the X2Go Session broker log files on package purgal.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index 9b74861..8835e64 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -23,17 +23,19 @@ case "$1" in
dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent
fi
- if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
-
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --remove /var/log/x2gobroker
fi
+ rm -Rf /var/log/x2gobroker
+ fi
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (if not in use by x2gobroker-daemon
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
- rm -Rfv /var/lib/x2gobroker
+ rm -Rf /var/lib/x2gobroker
fi
;;
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index a1e2845..3eba400 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -19,12 +19,14 @@ set -e
case "$1" in
purge)
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
-
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --remove /var/log/x2gobroker
fi
+ rm -Rf /var/log/x2gobroker
+ fi
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm
index 006022f..9b2b170 100755
--- a/debian/x2gobroker-wsgi.postrm
+++ b/debian/x2gobroker-wsgi.postrm
@@ -19,12 +19,14 @@ set -e
case "$1" in
purge)
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
-
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --remove /var/log/x2gobroker
fi
+ rm -Rf /var/log/x2gobroker
+ fi
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/x2gobroker/tests/test_uccsjson.py b/x2gobroker/tests/test_uccsjson.py
new file mode 100644
index 0000000..e69de29
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).
[View Less]