This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from a5c2d20 dynamic cookie auth: add a note about handling old/stray cookie files new 45b79b6 Store cookies in /var/lib/x2gobroker (path is more appropriate than previously suggested path /var/log/x2gobroker). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ etc/x2gobroker.conf | 2 +- x2gobroker/defaults.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 45b79b650bed804f9582e74fa97c87c44689656d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Mar 9 14:08:12 2014 +0100 Store cookies in /var/lib/x2gobroker (path is more appropriate than previously suggested path /var/log/x2gobroker). --- debian/changelog | 2 ++ etc/x2gobroker.conf | 2 +- x2gobroker/defaults.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba6bb07..ac7f2aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Allow switching to dynamic cookie auth, after the connection has been successfully established by a first successful user+password authentication. + - Store cookies in /var/lib/x2gobroker (path is more appropriate than + previously suggested path /var/log/x2gobroker). * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 4924a26..33f8ccf 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -55,7 +55,7 @@ # Client cookies (both static and dynamic) must be stored as local files. # This is the directory where those files will be stored. Please make sure # the permissions are set to allow the x2go broker process to write to this directory -#cookie-directory = '/var/log/x2gobroker/cookies' +#cookie-directory = '/var/lib/x2gobroker/cookies' # Pre and Post authentication scripts give you the option to run outside scripts # or adjust the values of variables for users logging in. Pre scripts run just diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index e6677f9..c1b3749 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -185,7 +185,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'password-auth-initializes-cookie': True, u'use-static-cookie': True, u'auth-timeout': 36000, - u'cookie-directory': '/var/log/x2gobroker/cookies', + u'cookie-directory': '/var/lib/x2gobroker/cookies', u'verify-ip': True, u'pre_auth_scripts': [], u'post_auth_scripts': [], -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org