This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit ca222fafea89948d12a666b48ba0ec77ed2ca20a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 19:31:07 2014 +0100 Configure broker / authservice environment via .service files. --- debian/changelog | 1 + x2gobroker-authservice.service | 4 ++++ x2gobroker-daemon.service | 4 ++++ x2gobroker.spec | 1 - x2gobroker/defaults.py | 4 ++-- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed9222e..3f6e4ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -171,6 +171,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low port 8080. - Provide legacy support for deprecated x2gobroker.conf global parameter 'check-credentials'. + - Configure broker / authservice environment via .service files. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker-authservice.service b/x2gobroker-authservice.service index 46263ec..6ab800c 100644 --- a/x2gobroker-authservice.service +++ b/x2gobroker-authservice.service @@ -2,7 +2,11 @@ Description=X2Go Session Broker Authentication Service [Service] +User=x2gobroker +Group=x2gobroker Type=forking +RuntimeDirectory=x2gobroker +RuntimeDirectoryMode=0770 ExecStart=/usr/sbin/x2gobroker-authservice PIDFile=/run/x2gobroker/x2gobroker-authservice diff --git a/x2gobroker-daemon.service b/x2gobroker-daemon.service index 20438d6..87728e9 100644 --- a/x2gobroker-daemon.service +++ b/x2gobroker-daemon.service @@ -2,7 +2,11 @@ Description=X2Go Session Broker Daemon [Service] +User=x2gobroker +Group=x2gobroker Type=forking +RuntimeDirectory=x2gobroker +RuntimeDirectoryMode=0770 ExecStart=/usr/bin/x2gobroker-daemon -D --drop-privileges PIDFile=/run/x2gobroker/x2gobroker-daemon.pid diff --git a/x2gobroker.spec b/x2gobroker.spec index 06550e1..c62a69b 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -404,7 +404,6 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group fi fi - %if 0%{?suse_version} %post -n python-x2gobroker %set_permissions %{_localstatedir}/log/x2gobroker diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 91931c7..43e7761 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -133,10 +133,10 @@ elif iniconfig_loaded and iniconfig.has_option(iniconfig_section, 'X2GOBROKER_AU elif iniconfig_loaded and iniconfig.has_option('common', 'X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=iniconfig.get('common', 'X2GOBROKER_AUTHSERVICE_SOCKET') else: - if os.path.isdir('/run'): + if os.path.isdir('/run/x2gobroker'): RUNDIR = '/run' else: - RUNDIR = '/var/run' + RUNDIR = '/var/run/x2gobroker' X2GOBROKER_AUTHSERVICE_SOCKET="{run}/x2gobroker/x2gobroker-authservice.socket".format(run=RUNDIR) if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git