x2go-commits December 2013

x2go-commits@lists.x2go.org

2 participants
2076 discussions

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

20 Dec '13

The branch, master has been updated via fc8d5d8412bcef24ae31bc571788baf0605cee30 (commit) from 7fef53d554f5f748f9a15c35779ecb4f84056199 (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 fc8d5d8412bcef24ae31bc571788baf0605cee30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 11:00:54 2013 +0100 Detect RUNDIR in x2gobroker Python module and use it for the default location of the authservice socket file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/defaults.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c42c9e2..0e2cf9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Support daemonizing of the authservice. - Detect RUNDIR in x2gobroker-authservice and use it for the default location of the authservice socket file. + - Detect RUNDIR in x2gobroker Python module and use it for the default + location of the authservice socket file. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 9087027..064acdb 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -84,7 +84,11 @@ else: if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] else: - X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket" + if os.path.isdir('/run'): + RUNDIR = '/run' + else: + RUNDIR = '/var/run' + X2GOBROKER_AUTHSERVICE_SOCKET="{run}/x2gobroker/x2gobroker-authservice.socket".format(run=RUNDIR) if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND'] 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-128-g7fef53d
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 7fef53d554f5f748f9a15c35779ecb4f84056199 (commit) from 9c782c9482056c88eac22a6e6ac44bf67f7b971d (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 7fef53d554f5f748f9a15c35779ecb4f84056199 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 10:58:46 2013 +0100 Detect RUNDIR in x2gobroker-authservice and use it for the default location of the authservice socket file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ sbin/x2gobroker-authservice | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6507211..c42c9e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Make the inifile broker backend the default backend. - Support daemonizing of the http broker. - Support daemonizing of the authservice. + - Detect RUNDIR in x2gobroker-authservice and use it for the default + location of the authservice 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 8de7308..251de86 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -32,14 +32,15 @@ import getpass import logging.config import pam +if os.path.isdir('/run'): + RUNDIR = '/run' +else: + RUNDIR = '/var/run' + try: import daemon import lockfile CAN_DAEMONIZE = True - if os.path.isdir('/run'): - RUNDIR = '/run' - else: - RUNDIR = '/var/run' pidfile = '{run}/x2gobroker/x2gobroker-authservice.pid'.format(run=RUNDIR) daemon_logdir = '/var/log/x2gobroker/' except ImportError: @@ -125,7 +126,7 @@ else: if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] else: - X2GOBROKER_AUTHSERVICE_SOCKET="/run/x2gobroker/x2gobroker-authservice.socket" + 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'): 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-127-g9c782c9
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 9c782c9482056c88eac22a6e6ac44bf67f7b971d (commit) from 432cb2453b561708a6942c1bc4eb9291b98d15e9 (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 9c782c9482056c88eac22a6e6ac44bf67f7b971d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 10:41:13 2013 +0100 x2gobroker.spec: fix R for python-paramiko ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index d053050..f7d5b34 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -54,7 +54,7 @@ Requires: python2 Requires: python-pampy Requires: python-netaddr Requires: python-tornado -Requires: paramiko +Requires: python-paramiko Requires: python-daemon Requires: python-lockfile 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-126-g432cb24
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 432cb2453b561708a6942c1bc4eb9291b98d15e9 (commit) from 848af7187009aa6af1411584fdcbb9b1b8d4c101 (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 432cb2453b561708a6942c1bc4eb9291b98d15e9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 10:24:22 2013 +0100 fix logfile name in last commit ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-authservice | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index aedf233..8de7308 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -228,8 +228,8 @@ if __name__ == '__main__': 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-daemon.stdout', 'w+') - daemon_stderr = file(daemon_logdir+'x2gobroker-daemon.stderr', 'w+') + daemon_stdout = file(daemon_logdir+'x2gobroker-authservice.stdout', 'w+') + daemon_stderr = file(daemon_logdir+'x2gobroker-authservice.stderr', 'w+') 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-125-g848af71
by git-admin＠x2go.org 20 Dec '13

20 Dec '13

The branch, master has been updated via 848af7187009aa6af1411584fdcbb9b1b8d4c101 (commit) from 4c738f9ac94a649c5ce51968c3d708a4b6830af0 (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 848af7187009aa6af1411584fdcbb9b1b8d4c101 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Dec 20 10:18:46 2013 +0100 switch to python-daemon for daemonizing... ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 26 +++++++++++++++++++++++--- debian/control | 2 ++ man/man1/x2gobroker.1 | 3 +++ man/man8/x2gobroker-authservice.8 | 3 +++ sbin/x2gobroker-authservice | 30 +++++++++++++++++++++++++++--- x2gobroker.spec | 2 ++ 6 files changed, 60 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 8e4c5bf..0cc7365 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -29,13 +29,15 @@ import logging import thread try: - import daemonize + import daemon + import lockfile CAN_DAEMONIZE = True if os.path.isdir('/run'): RUNDIR = '/run' else: RUNDIR = '/var/run' pidfile = '{run}/x2gobroker/x2gobroker-daemon.pid'.format(run=RUNDIR) + daemon_logdir = '/var/log/x2gobroker/' except ImportError: CAN_DAEMONIZE = False @@ -109,6 +111,7 @@ if __name__ == "__main__": 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', }, + {'args':['-L', '--logdir'], 'default': daemon_logdir, 'help': 'Directory where log files for the process\'s stdout and stderr can be created', }, ]) sshbroker_options = [ {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon', }, @@ -194,6 +197,21 @@ if __name__ == "__main__": print("Insufficent privileges. Cannot create PID file {pidfile} path".format(pidfile=pidfile)) print("") sys.exit(-3) + daemon_logdir = os.path.expanduser(cmdline_args.logdir) + if not os.path.isdir(daemon_logdir): + try: + os.makedirs(daemon_logdir) + except: + pass + if not os.access(daemon_logdir, os.W_OK): + print("") + p.print_usage() + print("Insufficent privileges. Cannot create directory for stdout/stderr log files: {logdir}".format(logdir=daemon_logdir)) + print("") + sys.exit(-3) + else: + if not daemon_logdir.endswith('/'): + daemon_logdir += '/' # 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('*') @@ -252,8 +270,10 @@ if __name__ == "__main__": 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=launch_ioloop, keep_fds=keep_fds) - daemon.start() + 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)): + launch_ioloop() else: launch_ioloop() diff --git a/debian/control b/debian/control index f90379b..b1a9fa8 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,8 @@ Depends: ${python:Depends}, ${misc:Depends}, python, + python-daemon, + python-lockfile, python-pampy, python-netaddr, python-tornado, diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index 43958c0..fea10ac 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -77,6 +77,9 @@ 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). +.TP +\*(T<\fB\-L, \-\-logdir\fR\*(T> +Directory where stdout/stderr will be redirected after having daemonized (default: /var/log/x2gobroker/). .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 af9faa0..592426f 100644 --- a/man/man8/x2gobroker-authservice.8 +++ b/man/man8/x2gobroker-authservice.8 @@ -44,6 +44,9 @@ Fork this application to background and detach from the running terminal. \*(T<\fB\-P, \-\-pidfile\fR\*(T> Custom PID file location when daemonizing (default: <RUNDIR>/x2gobroker/x2gobroker-authservice.pid). .TP +\*(T<\fB\-L, \-\-logdir\fR\*(T> +Directory where stdout/stderr will be redirected after having daemonized (default: /var/log/x2gobroker/). +.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 diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index b5d93cf..aedf233 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -33,13 +33,15 @@ import logging.config import pam try: - import daemonize + import daemon + import lockfile CAN_DAEMONIZE = True if os.path.isdir('/run'): RUNDIR = '/run' else: RUNDIR = '/var/run' pidfile = '{run}/x2gobroker/x2gobroker-authservice.pid'.format(run=RUNDIR) + daemon_logdir = '/var/log/x2gobroker/' except ImportError: CAN_DAEMONIZE = False @@ -173,6 +175,7 @@ if __name__ == '__main__': 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', }, + {'args':['-L', '--logdir'], 'default': daemon_logdir, 'help': 'Directory where log files for the process\'s stdout and stderr can be created', }, ]) p = argparse.ArgumentParser(description='X2Go Session Broker (PAM Authentication Service)',\ formatter_class=argparse.RawDescriptionHelpFormatter, \ @@ -188,6 +191,8 @@ if __name__ == '__main__': cmdline_args = p.parse_args() if CAN_DAEMONIZE and cmdline_args.daemonize: + + # create directory for the PID file pidfile = os.path.expanduser(cmdline_args.pidfile) if not os.path.isdir(os.path.dirname(pidfile)): try: @@ -201,13 +206,32 @@ if __name__ == '__main__': print("") sys.exit(-3) + # create directory for logging + daemon_logdir = os.path.expanduser(cmdline_args.logdir) + if not os.path.isdir(daemon_logdir): + try: + os.makedirs(daemon_logdir) + except: + pass + if not os.access(daemon_logdir, os.W_OK): + print("") + p.print_usage() + print("Insufficent privileges. Cannot create directory for stdout/stderr log files: {logdir}".format(logdir=daemon_logdir)) + print("") + sys.exit(-3) + else: + if not daemon_logdir.endswith('/'): + daemon_logdir += '/' + socket_file = cmdline_args.socket_file AuthService(socket_file, owner=cmdline_args.owner, group_owner=cmdline_args.group, permissions=cmdline_args.permissions) 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 = daemonize.Daemonize(app="x2gobroker", pid=pidfile, action=loop, keep_fds=keep_fds) - daemon.start() + 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)): + loop() else: loop() except KeyboardInterrupt: diff --git a/x2gobroker.spec b/x2gobroker.spec index 04763eb..d053050 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -55,6 +55,8 @@ Requires: python-pampy Requires: python-netaddr Requires: python-tornado Requires: paramiko +Requires: python-daemon +Requires: python-lockfile %description -n python-x2gobroker X2Go is a server based computing environment with 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-124-g4c738f9
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 4c738f9ac94a649c5ce51968c3d708a4b6830af0 (commit) from f2e898266e4e0637743257d860fc3fa54a8004d1 (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 4c738f9ac94a649c5ce51968c3d708a4b6830af0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:51:18 2013 +0100 Split out python-x2gobroker sub-package. Install Apache2 config symlinks to /etc/httpd (not /etc/apache2). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker.spec | 74 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index adaa778..6507211 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low * x2gobroker.spec: + Provide x2gobroker.spec file for building RPM packages. Inspired by the packaging work in OpenSuSE. + + Split out python-x2gobroker sub-package. + + Install Apache2 config symlinks to /etc/httpd (not /etc/apache2). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/x2gobroker.spec b/x2gobroker.spec index 90ccc30..04763eb 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -21,12 +21,9 @@ BuildRequires: systemd %endif Requires: logrotate Requires: python-argparse -Requires: python-netaddr -Requires: python-pampy -Requires: python-paramiko Requires: python-setproctitle -Requires: python-tornado Requires: python-wsgilog +Requires: python-x2gobroker = %{version}-%{release} Requires(pre): shadow-utils %description @@ -50,6 +47,37 @@ X2Go server farms. This package contains the x2gobroker executable. +%package -n python-x2gobroker +Summary: X2Go Session Broker (Python modules) +Group: Applications/Communications +Requires: python2 +Requires: python-pampy +Requires: python-netaddr +Requires: python-tornado +Requires: paramiko + +%description -n python-x2gobroker +X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + +The session broker is a server tool for X2Go that +tells your X2Go Client application in a terminal +server cluster what servers and session types are +most appropriate for the user in front of the +X2Go terminal. + +A session broker is most useful in load balanced +X2Go server farms. + +This package contains the broker's Python library. + + %package authservice Summary: X2Go Session Broker (PAM authentication service) Group: Applications/Communications @@ -57,7 +85,7 @@ Requires: python2 Requires: python-argparse Requires: python-setproctitle Requires: python-pampy -Requires: x2gobroker = %{version}-%{release} +Requires: python-x2gobroker = %{version}-%{release} %description authservice X2Go is a server based computing environment with @@ -209,11 +237,11 @@ make install PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go" DESTDIR="$b" # Somewhat distro specific (especially the paths), thus this was not # done in the shipped tarball's Makefile # -mkdir -p "$b/%_sysconfdir/apache2"/{conf.d,vhosts.d} +mkdir -p "$b/%_sysconfdir/httpd"/{conf.d,vhosts.d} ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf" \ - "$b/%_sysconfdir/apache2/conf.d/x2gobroker-wsgi.conf" + "$b/%_sysconfdir/httpd/conf.d/x2gobroker-wsgi.conf" ln -s "%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost" \ - "$b/%_sysconfdir/apache2/vhosts.d/x2gobroker-wsgi.sample" + "$b/%_sysconfdir/httpd/vhosts.d/x2gobroker-wsgi.sample" %if 0%{?fedora} # System.d session cleanup script @@ -244,7 +272,7 @@ install -pm0755 %SOURCE1 \ %fdupes %buildroot/%_prefix %endif -%pre +%pre -n python-x2gobroker if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ /usr/sbin/useradd -c "X2Go Broker System User" \ @@ -252,7 +280,7 @@ if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/group -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; -%preun +%preun -n python-x2gobroker if /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null && ! [ -f %_libexecdir/x2go/x2gobroker-agent ]; then /usr/sbin/userdel x2gobroker; fi; @@ -330,20 +358,25 @@ if /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && ! type x2gobroker; fi; %files -%config %_sysconfdir/default/python-x2gobroker -%config %_sysconfdir/pam.d -%config(noreplace) %_sysconfdir/x2go -%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf -%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost - %_bindir/x2gobroker %_bindir/x2gobroker-testauth %_sbindir/x2gobroker-keygen -%python_sitelib/x2gobroker* %_mandir/man1/x2gobroker*.1* %_mandir/man8/x2gobroker-keygen.8* +%files -n python-x2gobroker +%config(noreplace) %_sysconfdir/x2go +%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf +%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost +%config %_sysconfdir/pam.d +%config %_sysconfdir/default/python-x2gobroker +%python_sitelib/x2gobroker* +%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker +%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker +%config %_sysconfdir/logrotate.d/x2gobroker-daemon + + %files authservice %defattr(-,root,root) %_initddir/x2gobroker-authservice @@ -357,16 +390,15 @@ fi; %defattr(-,root,root) %_initddir/x2gobroker-daemon %config %_sysconfdir/default/x2gobroker-daemon -%config %_sysconfdir/logrotate.d/x2gobroker-daemon -%attr(02750,x2gobroker,x2gobroker) %_localstatedir/log/x2gobroker -%attr(00750,x2gobroker,x2gobroker) %_localstatedir/lib/x2gobroker %_sbindir/x2gobroker-daemon-debug %_mandir/man8/x2gobroker-daemon-debug.8* %files wsgi %defattr(-,root,root) -%_sysconfdir/apache2 +%_sysconfdir/httpd +%_sysconfdir/x2go/x2gobroker-wsgi.apache.conf +%_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost %config %_sysconfdir/logrotate.d/x2gobroker-wsgi 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-117-g7ac8990
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 7ac89900fc8f98bc94c1651e520f8003b2f559a8 (commit) from 9cc96c24034b67ce69434d66b392f1ff1b59eaab (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 7ac89900fc8f98bc94c1651e520f8003b2f559a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:14:11 2013 +0100 rpm/x2gobroker.init use the broker's daemonizing support ----------------------------------------------------------------------- Summary of changes: rpm/x2gobroker-daemon.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index 38072ec..13a71fe 100644 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -69,7 +69,7 @@ export X2GOBROKER_SSL_KEYFILE exec=$DAEMON prog=$(basename $DAEMON) config=$DEFAULTCONFIG_DAEMON -OPTS="--mode HTTP -p \"$DAEMON_BIND_ADDRESS\"" +OPTS="--mode HTTP -D -P \"$PIDFILE_BROKER\" -b \"$DAEMON_BIND_ADDRESS\"" lockfile=/var/lock/subsys/$prog @@ -82,7 +82,7 @@ start() { if is_true $START_BROKER; then echo -n $"Starting $prog: " set +e - daemon --user $X2GOBROKER_DAEMON_USER $exec $OPTS + daemon --user $X2GOBROKER_DAEMON_USER $exec $OPTS 2>/dev/null retval=$? set -e echo 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-118-g538a0e8
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 538a0e8003c67a29f6fcd179909fbcf0e648da15 (commit) from 7ac89900fc8f98bc94c1651e520f8003b2f559a8 (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 538a0e8003c67a29f6fcd179909fbcf0e648da15 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:22:53 2013 +0100 improve daemonizing code in x2gobroker ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 35ed455..8e4c5bf 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -181,7 +181,7 @@ 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: + if CAN_DAEMONIZE and cmdline_args.daemonize: pidfile = os.path.expanduser(cmdline_args.pidfile) if not os.path.isdir(os.path.dirname(pidfile)): try: @@ -250,7 +250,7 @@ if __name__ == "__main__": http_server = tornado.httpserver.HTTPServer(application) http_server.listen(bind_port, address=bind_address) - if cmdline_args.daemonize: + 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=launch_ioloop, keep_fds=keep_fds) daemon.start() 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-123-gf2e8982
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via f2e898266e4e0637743257d860fc3fa54a8004d1 (commit) from 98993db402fd09fb4c8787729e8226fbe8866d6f (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 f2e898266e4e0637743257d860fc3fa54a8004d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:31:35 2013 +0100 rpm/*.init: on RHEL6 init.d/functions cannot handle -u bash option ----------------------------------------------------------------------- Summary of changes: rpm/x2gobroker-authservice.init | 8 ++++---- rpm/x2gobroker-daemon.init | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index 0f8dae0..b73ce43 100644 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -15,7 +15,10 @@ # Description: PAM authentication service for X2Go Session Broker ### END INIT INFO -set -eu +set -e + +# Source function library. +. /etc/rc.d/init.d/functions AUTHSERVICE=/usr/sbin/x2gobroker-authservice test -d /run && RUNDIR=/run || RUNDIR=/var/run @@ -44,9 +47,6 @@ export X2GOBROKER_DAEMON_USER export X2GOBROKER_DAEMON_GROUP export X2GOBROKER_AUTHSERVICE_SOCKET -# Source function library. -. /etc/rc.d/init.d/functions - exec=$AUTHSERVICE prog=$(basename $AUTHSERVICE) config=$DEFAULTCONFIG_AUTHSERVICE diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init index 13a71fe..b653a17 100644 --- a/rpm/x2gobroker-daemon.init +++ b/rpm/x2gobroker-daemon.init @@ -15,7 +15,7 @@ # Description: X2Go Session Broker comes with its own HTTP daemon ### END INIT INFO -set -eu +set -e DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run 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-121-g9b08fc9
by git-admin＠x2go.org 19 Dec '13

19 Dec '13

The branch, master has been updated via 9b08fc914cf3e25d04ecf6ed4935ca17979e1c8e (commit) from 3e55bbb0dcb5b02c5dc58774e040831ae9192292 (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 9b08fc914cf3e25d04ecf6ed4935ca17979e1c8e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 19 22:28:21 2013 +0100 fix for commit 167b8152 ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-authservice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 7f3c113..b5d93cf 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -39,7 +39,7 @@ try: RUNDIR = '/run' else: RUNDIR = '/var/run' - pidfile = '{run}/x2gobroker/x2gobroker-daemon.pid'.format(run=RUNDIR) + pidfile = '{run}/x2gobroker/x2gobroker-authservice.pid'.format(run=RUNDIR) except ImportError: CAN_DAEMONIZE = False 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2013