x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-119-g167b815
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 167b8152ce5403b169a55573d72c43880967b8b6 (commit) from 538a0e8003c67a29f6fcd179909fbcf0e648da15 (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 ----------------------------------------------------------------- commit 167b8152ce5403b169a55573d72c43880967b8b6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:23:17 2013 +0100 Support daemonizing of the authservice. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + sbin/x2gobroker-authservice | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1fe4749..adaa778 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low an sbin to a bin directory (executable for any user). - Make the inifile broker backend the default backend. - Support daemonizing of the http broker. + - Support daemonizing of the authservice. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index d45c84c..7f3c113 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -32,6 +32,17 @@ import getpass import logging.config import pam +try: + import daemonize + CAN_DAEMONIZE = True + if os.path.isdir('/run'): + RUNDIR = '/run' + else: + RUNDIR = '/var/run' + pidfile = '{run}/x2gobroker/x2gobroker-daemon.pid'.format(run=RUNDIR) +except ImportError: + CAN_DAEMONIZE = False + from pwd import getpwnam from grp import getgrnam @@ -158,6 +169,11 @@ if __name__ == '__main__': {'args':['-p','--permissions'], 'default': '0660', 'help': 'set these file permissions for the AuthService socket file', }, ] + if CAN_DAEMONIZE: + common_options.extend([ + {'args':['-D', '--daemonize'], 'default': False, 'action': 'store_true', 'help': 'Detach the X2Go Broker process from the current terminal and fork to background', }, + {'args':['-P', '--pidfile'], 'default': pidfile, 'help': 'Alternative file path for the daemon\'s PID file', }, + ]) p = argparse.ArgumentParser(description='X2Go Session Broker (PAM Authentication Service)',\ formatter_class=argparse.RawDescriptionHelpFormatter, \ add_help=True, argument_default=None) @@ -171,9 +187,28 @@ if __name__ == '__main__': cmdline_args = p.parse_args() + if CAN_DAEMONIZE and cmdline_args.daemonize: + pidfile = os.path.expanduser(cmdline_args.pidfile) + if not os.path.isdir(os.path.dirname(pidfile)): + try: + os.makedirs(os.path.dirname(pidfile)) + except: + pass + if not os.access(os.path.dirname(pidfile), os.W_OK) or (os.path.exists(pidfile) and not os.access(pidfile, os.W_OK)): + print("") + p.print_usage() + print("Insufficent privileges. Cannot create PID file {pidfile} path".format(pidfile=pidfile)) + print("") + sys.exit(-3) + socket_file = cmdline_args.socket_file AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions) try: - loop() + if CAN_DAEMONIZE and cmdline_args.daemonize: + keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] + daemon = daemonize.Daemonize(app="x2gobroker", pid=pidfile, action=loop, keep_fds=keep_fds) + daemon.start() + else: + loop() except KeyboardInterrupt: pass 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-120-g3e55bbb
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 3e55bbb0dcb5b02c5dc58774e040831ae9192292 (commit) from 167b8152ce5403b169a55573d72c43880967b8b6 (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 ----------------------------------------------------------------- commit 3e55bbb0dcb5b02c5dc58774e040831ae9192292 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:27:49 2013 +0100 update man pages about daemonizing ----------------------------------------------------------------------- Summary of changes: man/man1/x2gobroker.1 | 6 ++++++ man/man8/x2gobroker-authservice.8 | 6 ++++++ 2 files changed, 12 insertions(+) The diff of changes is: diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index 3e60084..43958c0 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -71,6 +71,12 @@ Query another than the default broker backend. .TP \*(T<\fB\-b, \-\-bind ADDRESS:PORT\fR\*(T> The [address:]port that the Tornado http-engine will bind to (default: 127.0.0.1:8080). +.TP +\*(T<\fB\-D, \-\-daemonize\fR\*(T> +Fork this application to background and detach from the running terminal. +.TP +\*(T<\fB\-P, \-\-pidfile\fR\*(T> +Custom PID file location when daemonizing (default: <RUNDIR>/x2gobroker/x2gobroker-daemon.pid). .SH "FILES" /etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) .PP diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8 index 01d701c..af9faa0 100644 --- a/man/man8/x2gobroker-authservice.8 +++ b/man/man8/x2gobroker-authservice.8 @@ -38,6 +38,12 @@ This command is normally started through an init script. \*(T<\fB\-h, \-\-help\fR\*(T> Display a help with all available command line options and exit. .TP +\*(T<\fB\-D, \-\-daemonize\fR\*(T> +Fork this application to background and detach from the running terminal. +.TP +\*(T<\fB\-P, \-\-pidfile\fR\*(T> +Custom PID file location when daemonizing (default: <RUNDIR>/x2gobroker/x2gobroker-authservice.pid). +.TP \*(T<\fB\-s <AUTHSOCKET>, \-\-socket <AUTHSOCKET>\fR\*(T> File name of the unix domain socket file used for communication between broker and authentication service. .TP 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-122-g98993db
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 98993db402fd09fb4c8787729e8226fbe8866d6f (commit) from 9b08fc914cf3e25d04ecf6ed4935ca17979e1c8e (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 ----------------------------------------------------------------- commit 98993db402fd09fb4c8787729e8226fbe8866d6f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:30:21 2013 +0100 rpm/x2gobroker-authservice.init: use daemonizing feature for RPM init scripts ----------------------------------------------------------------------- Summary of changes: rpm/x2gobroker-authservice.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index 710da2c..0f8dae0 100644 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -50,7 +50,7 @@ export X2GOBROKER_AUTHSERVICE_SOCKET exec=$AUTHSERVICE prog=$(basename $AUTHSERVICE) config=$DEFAULTCONFIG_AUTHSERVICE -OPTS="-s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660" +OPTS="-D -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660" lockfile=/var/lock/subsys/$prog 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-116-g9cc96c2
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 9cc96c24034b67ce69434d66b392f1ff1b59eaab (commit) from 292c63786872749fd4c10ca0106d4cd1142bb327 (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 ----------------------------------------------------------------- commit 9cc96c24034b67ce69434d66b392f1ff1b59eaab Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:11:11 2013 +0100 Support daemonizing of the http broker. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 47 ++++++++++++++++++++++++++++++++++++++++++++++- debian/changelog | 1 + 2 files changed, 47 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 0b4c881..35ed455 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -28,6 +28,18 @@ import socket import logging import thread +try: + import daemonize + CAN_DAEMONIZE = True + if os.path.isdir('/run'): + RUNDIR = '/run' + else: + RUNDIR = '/var/run' + pidfile = '{run}/x2gobroker/x2gobroker-daemon.pid'.format(run=RUNDIR) +except ImportError: + CAN_DAEMONIZE = False + + def prep_http_mode(): global urls @@ -93,6 +105,11 @@ if __name__ == "__main__": daemon_options = [ {'args':['-b', '--bind'], 'default': None, 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, ] + if CAN_DAEMONIZE: + daemon_options.extend([ + {'args':['-D', '--daemonize'], 'default': False, 'action': 'store_true', 'help': 'Detach the X2Go Broker process from the current terminal and fork to background', }, + {'args':['-P', '--pidfile'], 'default': pidfile, 'help': 'Alternative file path for the daemon\'s PID file', }, + ]) sshbroker_options = [ {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon', }, {'args':['--user'], 'default': None, 'metavar': 'USER_NAME', 'help': 'Operate on behalf of this user name', }, @@ -136,6 +153,7 @@ if __name__ == "__main__": sys.exit(-1) elif cmdline_args.mode.upper() == 'SSH': if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...') + if cmdline_args.daemonize: logger_broker.warn('ignoring non-valid option --daemonize for broker mode SSH...') if cmdline_args.profile_id and cmdline_args.task != 'selectsession': #logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') pass @@ -163,6 +181,20 @@ if __name__ == "__main__": if cmdline_args.task: logger_broker.warn('ignoring non-valid option --task for broker mode HTTP...') if cmdline_args.profile_id: logger_broker.warn('ignoring non-valid option --profile-id for broker mode HTTP...') + if cmdline_args.daemonize: + pidfile = os.path.expanduser(cmdline_args.pidfile) + if not os.path.isdir(os.path.dirname(pidfile)): + try: + os.makedirs(os.path.dirname(pidfile)) + except: + pass + if not os.access(os.path.dirname(pidfile), os.W_OK) or (os.path.exists(pidfile) and not os.access(pidfile, os.W_OK)): + print("") + p.print_usage() + print("Insufficent privileges. Cannot create PID file {pidfile} path".format(pidfile=pidfile)) + print("") + sys.exit(-3) + # some people just give the port but prepend a colon, webpy does not like this, so we strip if off cmdline_args.bind = cmdline_args.bind.lstrip('*') cmdline_args.bind = cmdline_args.bind.lstrip(':') @@ -183,6 +215,7 @@ if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_T logger_access.setLevel(logging.DEBUG) logger_error.setLevel(logging.DEBUG) + # run the Python Tornado standalone daemon or handle interactive command line execution (via SSH) if __name__ == "__main__": @@ -197,6 +230,11 @@ if __name__ == "__main__": import tornado.web import tornado.httpserver import tornado.ioloop + + def launch_ioloop(): + logger_broker.info('Forking daemon to background, PID file is: {pidfile}'.format(pidfile=pidfile)) + tornado.ioloop.IOLoop.instance().start() + application = tornado.web.Application(urls, **settings) try: if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: @@ -211,7 +249,14 @@ if __name__ == "__main__": # run without https http_server = tornado.httpserver.HTTPServer(application) http_server.listen(bind_port, address=bind_address) - tornado.ioloop.IOLoop.instance().start() + + if cmdline_args.daemonize: + keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] + daemon = daemonize.Daemonize(app="x2gobroker", pid=pidfile, action=launch_ioloop, keep_fds=keep_fds) + daemon.start() + else: + launch_ioloop() + except socket.error as e: print (e) diff --git a/debian/changelog b/debian/changelog index 9dd0ee7..1fe4749 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Adapt man page installation to moval of x2gobroker(-testauth) from an sbin to a bin directory (executable for any user). - Make the inifile broker backend the default backend. + - Support daemonizing of the http broker. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. 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).

1 0

python-daemonize.git - master (branch) updated: debian/2.2.1-1-3-gad6ef4f
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via ad6ef4faa78975537edc7c8b27913fbaf14223c9 (commit) from de51c88da9e547975a4cefe1c778c9790241568e (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 ----------------------------------------------------------------- commit ad6ef4faa78975537edc7c8b27913fbaf14223c9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 11:26:17 2013 +0100 decrease compat level ----------------------------------------------------------------------- Summary of changes: debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/compat b/debian/compat index f11c82a..c793025 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +7 \ No newline at end of file hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

python-daemonize.git - master (branch) updated: debian/2.2.1-1-2-gde51c88
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via de51c88da9e547975a4cefe1c778c9790241568e (commit) from ba6880f034a81866620761a4c6f4c4f31f37ba5e (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 ----------------------------------------------------------------- commit de51c88da9e547975a4cefe1c778c9790241568e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 11:25:22 2013 +0100 Make the package build against Debian squeeze. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a5b4829..ccf6fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-daemonize (2.2.1-0x2go1) UNRELEASED; urgency=low * Decrease package version to make it fit into X2Go pkg archive for Debian. + * Make the package build against Debian squeeze. -- Mike Gabriel <sunweaver(a)debian.org> Thu, 19 Dec 2013 11:17:08 +0100 diff --git a/debian/control b/debian/control index 85fbb29..0e7af50 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Mike Gabriel <sunweaver(a)debian.org>, Build-Depends: cdbs (>= 0.4.90~), - debhelper (>= 9), - python (>= 2.6.6-14~), + debhelper (>= 7.0.50~), + python (>= 2.6.6-3~), python-setuptools, Standards-Version: 3.9.5 Homepage: http://pypi.python.org/pypi/daemonize hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

python-daemonize.git - master (branch) updated: debian/2.2.1-1-1-gba6880f
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via ba6880f034a81866620761a4c6f4c4f31f37ba5e (commit) from 7c85d59ff7e09b0d7bf939dcaf2b18f240b07139 (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 ----------------------------------------------------------------- commit ba6880f034a81866620761a4c6f4c4f31f37ba5e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 11:18:17 2013 +0100 Decrease package version to make it fit into X2Go pkg archive for Debian. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 88bfbca..a5b4829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-daemonize (2.2.1-0x2go1) UNRELEASED; urgency=low + + * Decrease package version to make it fit into X2Go pkg archive + for Debian. + + -- Mike Gabriel <sunweaver(a)debian.org> Thu, 19 Dec 2013 11:17:08 +0100 + python-daemonize (2.2.1-1) unstable; urgency=low * Initial release. (Closes: #732603) hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

python-daemonize.git - pristine-tar (branch) created: 367f619b04d79262ebd1a205eb6617feffc9f3c3
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, pristine-tar has been created at 367f619b04d79262ebd1a205eb6617feffc9f3c3 (commit) - Log ----------------------------------------------------------------- commit 367f619b04d79262ebd1a205eb6617feffc9f3c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 11:12:11 2013 +0100 pristine-tar data for python-daemonize_2.2.1.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

python-daemonize.git - upstream (branch) created: 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, upstream has been created at 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

python-daemonize.git - master (branch) created: 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been created at 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1 (commit) - Log ----------------------------------------------------------------- commit 8632eed3bf45a20c1c5622d7a6e7487f242dd5b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 11:12:10 2013 +0100 Imported Upstream version 2.2.1 ----------------------------------------------------------------------- hooks/post-receive -- python-daemonize.git (python-daemonize upstream project) 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 "python-daemonize.git" (python-daemonize upstream project).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013