The branch, master-inai has been updated via 4092800379a2df84aff513d0fdaeeb8ed7824800 (commit) from c095f00db803b2e547a190aa1ff4b55f865e816f (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: sbin/x2gobroker | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 02287fc..b79f3d3 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -30,6 +30,7 @@ try: import x2gobroker except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) + import x2gobroker.defaults # parse-in potential command line options cmdline_args = None @@ -38,7 +39,7 @@ if __name__ == "__main__": setproctitle.setproctitle(os.path.basename(sys.argv[0])) daemon_options = [ - {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: /etc/x2go/x2gobroker.conf', }, + {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, {'args':['-b', '--bind'], 'default': '127.0.0.1:8080', 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, ] p = argparse.ArgumentParser(description='X2Go Session Broker (Standalone Daemon)',\ @@ -54,10 +55,8 @@ if __name__ == "__main__": cmdline_args = p.parse_args() - ### FIXME: not working yet for the config_file diversion via -C option - broker_kwargs = { - 'config_file': cmdline_args.config_file, - } + if cmdline_args.config_file is not None: + x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file # import classes serving the different web.py URLs from x2gobroker.web.plain import * 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).