x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-141-gf127c28
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via f127c285ba799fce05548305573b87e1c98927f3 (commit) from 4385a7569af19978621a7b2d8a016c6cc03b60f8 (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 f127c285ba799fce05548305573b87e1c98927f3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 23:15:06 2013 +0100 Default to http broker mode when daemonizing the broker. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 8 ++++++++ debian/changelog | 1 + 2 files changed, 9 insertions(+) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 287f0c7..2de8954 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -154,9 +154,16 @@ if __name__ == "__main__": if cmdline_args.debug: x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + # daemonizing only makes sense for the HTTP broker mode... + if cmdline_args.daemonize: + cmdline_args.mode = 'HTTP' + + # evaluate other cmdline options depending on the broker mode if cmdline_args.mode.upper() not in ('SSH', 'HTTP'): logger_broker.error('Invalid mode selected. Available: SSH or HTTP.') sys.exit(-1) + + ### SSH broker 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...') @@ -175,6 +182,7 @@ if __name__ == "__main__": print("") sys.exit(-2) + ### HTTP broker elif cmdline_args.mode.upper() == 'HTTP': if interactive_mode_warning: logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER)) diff --git a/debian/changelog b/debian/changelog index b99fdb1..ae86bdf 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. + - Default to http broker mode when daemonizing the broker. - Support daemonizing of the authservice. - Detect RUNDIR in x2gobroker-authservice and use it for the default location of the authservice socket file. 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-138-ged6b149
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via ed6b149b1a6f37e22ba8b43413684736b30167c2 (commit) from 03f920d85e476e22b49a10a665f1064494abd02a (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 ed6b149b1a6f37e22ba8b43413684736b30167c2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 16:29:19 2013 +0100 remove artifact ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index 6693600..69179f8 100755 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ install: python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ "${DESTDIR}/etc/default" - if [ -e /etc/debian_version ]; then ${INSTALL_FILE} defaults/python-x2gobroker.default \ + ${INSTALL_FILE} defaults/python-x2gobroker.default \ "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ 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-137-g03f920d
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 03f920d85e476e22b49a10a665f1064494abd02a (commit) from 8044a7866409621d72fed6ddcd3c496c1f7acbbe (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 03f920d85e476e22b49a10a665f1064494abd02a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 16:24:28 2013 +0100 Provide PAM config file for Debian and RHEL separately (as they differ). ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +++--- debian/changelog | 1 + pam/{x2gobroker => x2gobroker.Debian} | 0 pam/x2gobroker.RHEL | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) rename pam/{x2gobroker => x2gobroker.Debian} (100%) create mode 100644 pam/x2gobroker.RHEL The diff of changes is: diff --git a/Makefile b/Makefile index c48277d..6693600 100755 --- a/Makefile +++ b/Makefile @@ -79,14 +79,14 @@ install: python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ "${DESTDIR}/etc/default" - ${INSTALL_FILE} defaults/python-x2gobroker.default \ + if [ -e /etc/debian_version ]; then ${INSTALL_FILE} defaults/python-x2gobroker.default \ "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ etc/broker/x2gobroker-loggers.conf \ "${DESTDIR}${ETCDIR}/broker/" - mkdir -p "${DESTDIR}/etc/pam.d" - ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" + if [ -e /etc/debian_version ]; then ${INSTALL_FILE} pam/x2gobroker.Debian "${DESTDIR}/etc/pam.d/x2gobroker"; fi + if [ -e /etc/redhat-release ]; then ${INSTALL_FILE} pam/x2gobroker.RHEL "${DESTDIR}/etc/pam.d/x2gobroker"; fi # x2gobroker-agent mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ diff --git a/debian/changelog b/debian/changelog index 8d2158a..b99fdb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Detect RUNDIR in x2gobroker Python module and use it for the default location of the authservice socket file. - Let x2gobroker-authservice take care of tidying up its own socket file. + - Provide PAM config file for Debian and RHEL separately (as they differ). * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/pam/x2gobroker b/pam/x2gobroker.Debian similarity index 100% rename from pam/x2gobroker rename to pam/x2gobroker.Debian diff --git a/pam/x2gobroker.RHEL b/pam/x2gobroker.RHEL new file mode 100644 index 0000000..15553f9 --- /dev/null +++ b/pam/x2gobroker.RHEL @@ -0,0 +1,2 @@ +auth include system-auth +password include system-auth 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-136-g8044a78
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 8044a7866409621d72fed6ddcd3c496c1f7acbbe (commit) from 617d046c3864d73e91aa4f6701a27d43445f1562 (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 8044a7866409621d72fed6ddcd3c496c1f7acbbe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 16:16:26 2013 +0100 move log message to a place where it makes sense ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 4f646dc..287f0c7 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -253,7 +253,6 @@ if __name__ == "__main__": 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) @@ -276,6 +275,7 @@ if __name__ == "__main__": keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+') + logger_broker.info('Forking daemon to background, PID file is: {pidfile}'.format(pidfile=pidfile)) with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): file(pidfile, 'w+').write(str(os.getpid())+'\n') launch_ioloop() 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-135-g617d046
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 617d046c3864d73e91aa4f6701a27d43445f1562 (commit) from 4a138b8dc508f36034a6020c2b4ba104b981cbb2 (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 617d046c3864d73e91aa4f6701a27d43445f1562 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 16:12:39 2013 +0100 finalize work on RPM init scripts ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- rpm/x2gobroker-authservice.init | 6 +----- rpm/x2gobroker-daemon.init | 11 +++++------ 3 files changed, 7 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index a505f30..4f646dc 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -277,7 +277,7 @@ if __name__ == "__main__": daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+') with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): - file(pidfile, 'w+').write(str(os.getpid())) + file(pidfile, 'w+').write(str(os.getpid())+'\n') launch_ioloop() else: launch_ioloop() diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index 7dd3567..9ccaf6c 100755 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -18,7 +18,7 @@ # Source function library. . /etc/rc.d/init.d/functions -set -xe +set -e AUTHSERVICE=/usr/sbin/x2gobroker-authservice test -d /run && RUNDIR=/run || RUNDIR=/var/run @@ -67,10 +67,6 @@ is_true() start() { [ -x $exec ] || exit 5 - if ps a -u root | grep -v grep | grep $AUTHSERVICE 1>/dev/null 2>/dev/null; then - echo "X2Go Broker Authentication Service already running" - START_AUTHSERVICE=no - fi if is_true $START_AUTHSERVICE; then # Make sure these are created by default so that nobody else can echo -n $"Starting $prog: " diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index 83da87f..3c2f33e 100755 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -18,7 +18,7 @@ # Source function library. . /etc/rc.d/init.d/functions -set -ex +set -e DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run @@ -71,14 +71,10 @@ prog=$(basename $DAEMON) config=$DEFAULTCONFIG_DAEMON OPTS="--mode HTTP -D -P \"$PIDFILE_BROKER\" -b \"$DAEMON_BIND_ADDRESS\"" -lockfile=/var/lock/subsys/$prog +lockfile=/var/lock/subsys/x2gobroker-daemon start() { [ -x $exec ] || exit 5 - if ps a -u $X2GOBROKER_DAEMON_USER | grep -v grep | grep $DAEMON 1>/dev/null 2>/dev/null; then - echo "X2Go Session Broker already running" - START_BROKER=no - fi if is_true $START_BROKER; then echo -n $"Starting $prog: " set +e @@ -92,10 +88,13 @@ start() { stop() { echo -n $"Stopping $prog: " + set +e killproc -p $PIDFILE_BROKER $exec retval=$? + set -e echo rm -f $lockfile + return $retval } restart() { 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-134-g4a138b8
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 4a138b8dc508f36034a6020c2b4ba104b981cbb2 (commit) from e488cf4b69f877fd0fe83caf39fbd36bcb33367e (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 4a138b8dc508f36034a6020c2b4ba104b981cbb2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 14:27:14 2013 +0100 x2gobroker.spec: rework init scripts for EPEL-6 ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- rpm/x2gobroker-authservice.init | 27 +++++++++++++++++++-------- rpm/x2gobroker-daemon.init | 24 +++++++++++++++++------- sbin/x2gobroker-authservice | 2 +- 4 files changed, 38 insertions(+), 17 deletions(-) mode change 100644 => 100755 rpm/x2gobroker-authservice.init mode change 100644 => 100755 rpm/x2gobroker-daemon.init The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 8e54b27..a505f30 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -276,8 +276,8 @@ if __name__ == "__main__": keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+') - file(pidfile, 'w+').write(str(os.getpid())) with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): + file(pidfile, 'w+').write(str(os.getpid())) launch_ioloop() else: launch_ioloop() diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init old mode 100644 new mode 100755 index b73ce43..7dd3567 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -15,13 +15,14 @@ # Description: PAM authentication service for X2Go Session Broker ### END INIT INFO -set -e - # Source function library. . /etc/rc.d/init.d/functions +set -xe + AUTHSERVICE=/usr/sbin/x2gobroker-authservice test -d /run && RUNDIR=/run || RUNDIR=/var/run +PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker DEFAULTCONFIG_AUTHSERVICE=/etc/default/x2gobroker-authservice @@ -50,7 +51,7 @@ export X2GOBROKER_AUTHSERVICE_SOCKET exec=$AUTHSERVICE prog=$(basename $AUTHSERVICE) config=$DEFAULTCONFIG_AUTHSERVICE -OPTS="-D -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660" +OPTS="-D -P $PIDFILE_AUTHSERVICE -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660" lockfile=/var/lock/subsys/$prog @@ -66,14 +67,13 @@ is_true() start() { [ -x $exec ] || exit 5 - if ps a -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then + if ps a -u root | grep -v grep | grep $AUTHSERVICE 1>/dev/null 2>/dev/null; then echo "X2Go Broker Authentication Service already running" START_AUTHSERVICE=no fi if is_true $START_AUTHSERVICE; then # Make sure these are created by default so that nobody else can echo -n $"Starting $prog: " - rm -f $X2GOBROKER_AUTHSERVICE_SOCKET set +e daemon $exec $OPTS retval=$? @@ -87,11 +87,12 @@ start() { stop() { echo -n $"Stopping $prog: " set +e - killproc $exec + killproc -p $PIDFILE_AUTHSERVICE $exec retval=$? set -e echo rm -f $lockfile + return $retval } @@ -113,39 +114,49 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p $PIDFILE_AUTHSERVICE $exec } rh_status_q() { - rh_status >/dev/null 2>&1 + rh_status 1>/dev/null 2>&1 } case "$1" in start) + set +e rh_status_q && exit 0 + set -e $1 ;; stop) + set +e rh_status_q || exit 0 + set -e $1 ;; restart) $1 ;; reload) + set +e rh_status_q || exit 7 + set -e $1 ;; force-reload) force_reload ;; status) + set +e rh_status + set -e ;; condrestart|try-restart) + set +e rh_status_q || exit 0 + set -e restart ;; *) diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init old mode 100644 new mode 100755 index b653a17..83da87f --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -15,7 +15,10 @@ # Description: X2Go Session Broker comes with its own HTTP daemon ### END INIT INFO -set -e +# Source function library. +. /etc/rc.d/init.d/functions + +set -ex DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run @@ -63,9 +66,6 @@ export X2GOBROKER_AUTHSERVICE_SOCKET export X2GOBROKER_SSL_CERTFILE export X2GOBROKER_SSL_KEYFILE -# Source function library. -. /etc/rc.d/init.d/functions - exec=$DAEMON prog=$(basename $DAEMON) config=$DEFAULTCONFIG_DAEMON @@ -75,7 +75,7 @@ lockfile=/var/lock/subsys/$prog start() { [ -x $exec ] || exit 5 - if ps a -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then + if ps a -u $X2GOBROKER_DAEMON_USER | grep -v grep | grep $DAEMON 1>/dev/null 2>/dev/null; then echo "X2Go Session Broker already running" START_BROKER=no fi @@ -92,7 +92,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc $exec + killproc -p $PIDFILE_BROKER $exec retval=$? echo rm -f $lockfile @@ -113,7 +113,7 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p $PIDFILE_BROKER $exec } rh_status_q() { @@ -123,28 +123,38 @@ rh_status_q() { case "$1" in start) + set +e rh_status_q && exit 0 + set -e $1 ;; stop) + set +e rh_status_q || exit 0 + set -e $1 ;; restart) $1 ;; reload) + set +e rh_status_q || exit 7 + set -e $1 ;; force-reload) force_reload ;; status) + set +e rh_status + set -e ;; condrestart|try-restart) + set +e rh_status_q || exit 0 + set -e restart ;; *) diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index ff9bbff..5aae163 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -240,8 +240,8 @@ if __name__ == '__main__': keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] daemon_stdout = file(daemon_logdir+'x2gobroker-authservice.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-authservice.stderr', 'w+') - file(pidfile, 'w+').write(str(os.getpid())) with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): + file(pidfile, 'w+').write(str(os.getpid())+"\n") loop() else: loop() 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-133-ge488cf4
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via e488cf4b69f877fd0fe83caf39fbd36bcb33367e (commit) from fc425cac66ea58ae30505ce5a9bb1cf89feab548 (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 e488cf4b69f877fd0fe83caf39fbd36bcb33367e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 13:25:16 2013 +0100 really write a PID file containing the current process's PID ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 7 ++++++- sbin/x2gobroker-authservice | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 0cc7365..8e54b27 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -26,7 +26,7 @@ import sys import argparse import socket import logging -import thread +import atexit try: import daemon @@ -76,6 +76,9 @@ def logfile_prelude(): logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) +def cleanup_on_exit(): + try: os.remove(pidfile) + except: pass try: import x2gobroker.defaults @@ -269,9 +272,11 @@ if __name__ == "__main__": http_server.listen(bind_port, address=bind_address) if CAN_DAEMONIZE and cmdline_args.daemonize: + atexit.register(cleanup_on_exit) keep_fds = [int(fd) for fd in os.listdir('/proc/self/fd') if fd not in (0,1,2) ] daemon_stdout = file(daemon_logdir+'x2gobroker-daemon.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+') + file(pidfile, 'w+').write(str(os.getpid())) with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): launch_ioloop() else: diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 574e41e..ff9bbff 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -106,8 +106,10 @@ def loop(): asyncore.loop() -def cleanup_socketfile(): +def cleanup_on_exit(): os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) + try: os.remove(pidfile) + except: pass # normally this would go into defaults.py, however, we do not want to pull in defaults.py here as that will create @@ -232,12 +234,13 @@ if __name__ == '__main__': socket_file = cmdline_args.socket_file AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions) - atexit.register(cleanup_socketfile) + atexit.register(cleanup_on_exit) try: 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_stdout = file(daemon_logdir+'x2gobroker-authservice.stdout', 'w+') daemon_stderr = file(daemon_logdir+'x2gobroker-authservice.stderr', 'w+') + file(pidfile, 'w+').write(str(os.getpid())) with daemon.DaemonContext(stdout=daemon_stdout, stderr=daemon_stderr, files_preserve=keep_fds, umask=0o027, pidfile=lockfile.FileLock(pidfile)): loop() else: 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-132-gfc425ca
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via fc425cac66ea58ae30505ce5a9bb1cf89feab548 (commit) from 3c1a4bfbaebfc929632660673dc021b8e9a4f244 (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 fc425cac66ea58ae30505ce5a9bb1cf89feab548 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 12:17:27 2013 +0100 x2gobroker-authservice: use atexit rather than signal to clean up socket file when authservice terminates ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-authservice | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 39bfe4f..574e41e 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -31,7 +31,7 @@ import socket import getpass import logging.config import pam -import signal +import atexit if os.path.isdir('/run'): RUNDIR = '/run' @@ -106,9 +106,8 @@ def loop(): asyncore.loop() -def sigterm_handler(): - try: os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) - except: pass +def cleanup_socketfile(): + os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) # normally this would go into defaults.py, however, we do not want to pull in defaults.py here as that will create @@ -232,8 +231,8 @@ if __name__ == '__main__': daemon_logdir += '/' socket_file = cmdline_args.socket_file - signal.signal(signal.SIGTERM, sigterm_handler) AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions) + atexit.register(cleanup_socketfile) try: 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) ] 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-131-g3c1a4bf
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 3c1a4bfbaebfc929632660673dc021b8e9a4f244 (commit) from 548c7792bfa2be3b2f067cdf747555a0321f4db9 (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 3c1a4bfbaebfc929632660673dc021b8e9a4f244 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 11:19:22 2013 +0100 improvement for last commit ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-authservice | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 199cab4..39bfe4f 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -107,7 +107,8 @@ def loop(): def sigterm_handler(): - os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) + try: os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) + except: pass # normally this would go into defaults.py, however, we do not want to pull in defaults.py here as that will create 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-130-g548c779
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 548c7792bfa2be3b2f067cdf747555a0321f4db9 (commit) from fc8d5d8412bcef24ae31bc571788baf0605cee30 (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 548c7792bfa2be3b2f067cdf747555a0321f4db9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 11:18:42 2013 +0100 Let x2gobroker-authservice take care of tidying up its own socket file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + sbin/x2gobroker-authservice | 7 +++++++ 2 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0e2cf9d..8d2158a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low location of the authservice socket file. - Detect RUNDIR in x2gobroker Python module and use it for the default location of the authservice socket file. + - Let x2gobroker-authservice take care of tidying up its own socket file. * 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 251de86..199cab4 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -31,6 +31,7 @@ import socket import getpass import logging.config import pam +import signal if os.path.isdir('/run'): RUNDIR = '/run' @@ -105,6 +106,10 @@ def loop(): asyncore.loop() +def sigterm_handler(): + os.remove(X2GOBROKER_AUTHSERVICE_SOCKET) + + # normally this would go into defaults.py, however, we do not want to pull in defaults.py here as that will create # unwanted logfiles (access.log, broker.log, error.log) when x2gobroker-authservice is installed as standalone service if os.environ.has_key('X2GOBROKER_DEBUG'): @@ -128,6 +133,7 @@ if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): else: X2GOBROKER_AUTHSERVICE_SOCKET="{run}/x2gobroker/x2gobroker-authservice.socket".format(run=RUNDIR) + # standalone daemon mode (x2gobroker-authservice as daemon) or interactive mode (called from the cmdline)? if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root'): @@ -225,6 +231,7 @@ if __name__ == '__main__': daemon_logdir += '/' socket_file = cmdline_args.socket_file + signal.signal(signal.SIGTERM, sigterm_handler) AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions) try: if CAN_DAEMONIZE and cmdline_args.daemonize: 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

← Newer
1
...
9
10
11
12
13
14
15
...
208
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013