This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 08e7b17d0fadbfe5ca14eb747d26401bcab14bfa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 6 00:41:53 2014 +0200 improve functionality of defaults.conf file --- etc/broker/defaults.conf | 25 +------------------------ x2gobroker/defaults.py | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/etc/broker/defaults.conf b/etc/broker/defaults.conf index f2b1031..b026c7b 100644 --- a/etc/broker/defaults.conf +++ b/etc/broker/defaults.conf @@ -18,9 +18,6 @@ # also make the broker available through http GET method requests # (otherwise: POST method requests only) and you will be able to test # the broker through your web browser -# -# This value has an effect on all (Python-based) X2Go Session Broker -# services and can be overridden in /etc/default/x2gobroker-* files. #X2GOBROKER_DEBUG=0 # Default X2Go Session Broker backend (available: zeroconf, inifile) @@ -44,18 +41,6 @@ # Bind standalone daemon to this address:port #DAEMON_BIND_ADDRESS=127.0.0.1:8080 -# Control debug mode (0=disable, 1=enable). -# -# Apart from verbose logging in /var/log/x2gobroker/*.log, this will -# also make the broker available through http GET method requests -# (otherwise: POST method requests only) and you will be able to -# test the broker through your web browser. -# -# This option can also be configured in /etc/default/python-x2go. -# The value configured here overrides the value from python-x2go -# defaults and only sets the x2gobroker-daemon into debug mode. -#X2GOBROKER_DEBUG=0 - ########################################################## ### ### ### Enable SSL Support ### @@ -73,13 +58,5 @@ [authservice] # X2Go Session Broker (PAM Authentication Service) configuration for Debian - -# Control debug mode (0=disable, 1=enable) of the X2Go Broker Authentication -# Service. # -# Logging is (by default) written to /var/log/x2gobroker/*log. -# -# This option can also be configured in /etc/default/python-x2go. -# The value configured here overrides the value from python-x2go -# defaults and only sets the x2gobroker-authservice into debug mode. -#X2GOBROKER_DEBUG=0 +# currently nothing to configure for the authentication service... \ No newline at end of file diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 011d45f..e4d95ac 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -150,21 +150,30 @@ elif iniconfig_loaded and iniconfig.has_option('common', 'X2GOBROKER_DEFAULT_BAC else: X2GOBROKER_DEFAULT_BACKEND = "inifile" +if os.environ.has_key('DAEMON_BIND_ADDRESS'): + DAEMON_BIND_ADDRESS = os.environ['DAEMON_BIND_ADDRESS'] +elif iniconfig_loaded and iniconfig.has_option(iniconfig_section, 'DAEMON_BIND_ADDRESS'): + DAEMON_BIND_ADDRESS = iniconfig.get(iniconfig_section, 'DAEMON_BIND_ADDRESS') +elif iniconfig_loaded and iniconfig.has_option('daemon', 'DAEMON_BIND_ADDRESS'): + DAEMON_BIND_ADDRESS = iniconfig.get('daemon', 'DAEMON_BIND_ADDRESS') +else: + DAEMON_BIND_ADDRESS = "" + if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): X2GOBROKER_SSL_CERTFILE = os.environ['X2GOBROKER_SSL_CERTFILE'] elif iniconfig_loaded and iniconfig.has_option(iniconfig_section, 'X2GOBROKER_SSL_CERTFILE'): - X2GOBROKER_SSL_CERTFILE=iniconfig.get(iniconfig_section, 'X2GOBROKER_SSL_CERTFILE') -elif iniconfig_loaded and iniconfig.has_option('common', 'X2GOBROKER_SSL_CERTFILE'): - X2GOBROKER_SSL_CERTFILE=iniconfig.get('common', 'X2GOBROKER_SSL_CERTFILE') + X2GOBROKER_SSL_CERTFILE = iniconfig.get(iniconfig_section, 'X2GOBROKER_SSL_CERTFILE') +elif iniconfig_loaded and iniconfig.has_option('daemon', 'X2GOBROKER_SSL_CERTFILE'): + X2GOBROKER_SSL_CERTFILE = iniconfig.get('daemon', 'X2GOBROKER_SSL_CERTFILE') else: X2GOBROKER_SSL_CERTFILE = "" if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): X2GOBROKER_SSL_KEYFILE = os.environ['X2GOBROKER_SSL_KEYFILE'] elif iniconfig_loaded and iniconfig.has_option(iniconfig_section, 'X2GOBROKER_SSL_KEYFILE'): - X2GOBROKER_SSL_KEYFILE=iniconfig.get(iniconfig_section, 'X2GOBROKER_SSL_KEYFILE') -elif iniconfig_loaded and iniconfig.has_option('common', 'X2GOBROKER_SSL_KEYFILE'): - X2GOBROKER_SSL_KEYFILE=iniconfig.get('common', 'X2GOBROKER_SSL_KEYFILE') + X2GOBROKER_SSL_KEYFILE = iniconfig.get(iniconfig_section, 'X2GOBROKER_SSL_KEYFILE') +elif iniconfig_loaded and iniconfig.has_option('daemon', 'X2GOBROKER_SSL_KEYFILE'): + X2GOBROKER_SSL_KEYFILE = iniconfig.get('daemon', 'X2GOBROKER_SSL_KEYFILE') else: X2GOBROKER_SSL_KEYFILE = "" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git