x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-103-gef39402
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via ef39402a2afea0c98e3e7568d1c2bbcc769b7b4a (commit) from e7060acc301ac402c64aaf554509b82a1697b69f (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 ef39402a2afea0c98e3e7568d1c2bbcc769b7b4a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:28:54 2013 +0100 x2gobroker.spec: fix %exclude expressions ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 7ae63e1..4588a0a 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -358,8 +358,8 @@ fi; %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) +%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.conf +%exclude %_sysconfdir/x2go/x2gobroker-wsgi.apache.vhost %_bindir/x2gobroker %_bindir/x2gobroker-testauth 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-101-g9ab3a62
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 9ab3a62536d24816c01ab3aa31881516fb9e1aac (commit) from 772fed17c8913f951da955640515cce9b53b9994 (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 9ab3a62536d24816c01ab3aa31881516fb9e1aac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:23:12 2013 +0100 x2gobroker.spec: whitespace/linebreak fix ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index 66389cc..7ae63e1 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -262,8 +262,7 @@ install -pm0755 "init/x2gobroker-daemon.init" \ #%endif %pre -if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && \ - /usr/sbin/groupadd -r x2gobroker; then +if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ /usr/sbin/useradd -c "x2go broker server/user" \ -d "%_localstatedir/lib/x2gobroker" \ 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-102-ge7060ac
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via e7060acc301ac402c64aaf554509b82a1697b69f (commit) from 9ab3a62536d24816c01ab3aa31881516fb9e1aac (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 e7060acc301ac402c64aaf554509b82a1697b69f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:23:16 2013 +0100 Adapt man page installation to moval of x2gobroker(-testauth) from an sbin to a bin directory (executable for any user). ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +++++- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index ee09c35..f48fcd8 100755 --- a/Makefile +++ b/Makefile @@ -125,8 +125,12 @@ install: # x2gobroker mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ + "${DESTDIR}${MANDIR}/man1" + mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ "${DESTDIR}${MANDIR}/man8" - ${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \ + ${INSTALL_FILE} man/man1/x2gobroker{,-testauth}.1* \ + "${DESTDIR}${MANDIR}/man1" + ${INSTALL_FILE} man/man8/x2gobroker-keygen.8* \ "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} bin/x2gobroker bin/x2gobroker-testauth \ "${DESTDIR}${BINDIR}/" diff --git a/debian/changelog b/debian/changelog index 01103aa..b020a2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Add new helper tool: x2gobroker-daemon-debug. - WebUI "plain": throw explainative log errors for every 404 http error. - Fix man pages (layout issues on x2gobroker-authservice man page). + - Adapt man page installation to moval of x2gobroker(-testauth) from + an sbin to a bin directory (executable for any user). * 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

x2gobroker.git - master (branch) updated: 0.0.2.3-100-g772fed1
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 772fed17c8913f951da955640515cce9b53b9994 (commit) from 86e323911a0966533d63648976b7f5680baf58cf (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 772fed17c8913f951da955640515cce9b53b9994 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:12:28 2013 +0100 x2gobroker.spec: no such package ,,adduser'', use shadow-utils instead as R(pre) ----------------------------------------------------------------------- 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 279a13d..66389cc 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -14,7 +14,6 @@ Source2: x2gobroker-authservice.init BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif -BuildRequires: adduser BuildRequires: python2-devel BuildRequires: python-setuptools %if 0%{?fedora} @@ -28,6 +27,7 @@ Requires: python-paramiko Requires: python-setproctitle Requires: python-tornado Requires: python-wsgilog +Requires(pre): shadow-utils %description 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-99-g86e3239
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 86e323911a0966533d63648976b7f5680baf58cf (commit) from 06cf8f9f877034d0f2db7ed86a406fecd55e1b22 (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 86e323911a0966533d63648976b7f5680baf58cf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:01:14 2013 +0100 x2gobroker.spec: fix release string ----------------------------------------------------------------------- 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 5ac7f1b..279a13d 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -1,6 +1,6 @@ Name: x2gobroker Version: 0.0.3.0 -Release: 0.0x2go1 +Release: 0.0x2go1%{?dist} Summary: X2Go Session Broker License: AGPL-3.0+ Group: Applications/Communications 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-97-g805c727
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 805c727d10d219ad88d40fb1e83a1de330acd612 (commit) from 0e37ee8857ee96b173f40780acfa95e5a9f9614b (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 805c727d10d219ad88d40fb1e83a1de330acd612 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 20:58:33 2013 +0100 x2gobroker.spec: fix version for RPM packages ----------------------------------------------------------------------- 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 1b7a7bf..fb25116 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -1,5 +1,5 @@ Name: x2gobroker -Version: 0.0.2.3 +Version: 0.0.3.0 Release: 0.0x2go1 Summary: X2Go Session Broker License: AGPL-3.0+ 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-98-g06cf8f9
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 06cf8f9f877034d0f2db7ed86a406fecd55e1b22 (commit) from 805c727d10d219ad88d40fb1e83a1de330acd612 (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 06cf8f9f877034d0f2db7ed86a406fecd55e1b22 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Dec 18 21:00:12 2013 +0100 x2gobroker.spec: drop permissions.d stuff ----------------------------------------------------------------------- Summary of changes: x2gobroker.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/x2gobroker.spec b/x2gobroker.spec index fb25116..5ac7f1b 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -20,7 +20,6 @@ BuildRequires: python-setuptools %if 0%{?fedora} BuildRequires: systemd %endif -PreReq: permissions Requires: logrotate Requires: python-argparse Requires: python-netaddr @@ -239,20 +238,20 @@ install -pm0755 "init/x2gobroker-daemon.init" \ # # Totally distro-specific # -mkdir -p "$b/%_sysconfdir/permissions.d" -pushd "$b/%_sysconfdir/permissions.d/" -cat >"%name.easy" <<-EOF - %_localstatedir/log/x2gobroker x2gobroker.x2gobroker 02750 - %_localstatedir/lib/x2gobroker x2gobroker.x2gobroker 00750 -EOF -cp "%name.easy" "%name.secure" -cp "%name.easy" "%name.paranoid" -cat >"%name-agent.easy" <<-EOF - %_libexecdir/x2go/x2gobroker-agent root.x2gobroker 04750 -EOF -cp "%name-agent.easy" "%name-agent.secure" -cp "%name-agent.easy" "%name-agent.paranoid" -popd +#mkdir -p "$b/%_sysconfdir/permissions.d" +#pushd "$b/%_sysconfdir/permissions.d/" +#cat >"%name.easy" <<-EOF +# %_localstatedir/log/x2gobroker x2gobroker.x2gobroker 02750 +# %_localstatedir/lib/x2gobroker x2gobroker.x2gobroker 00750 +#EOF +#cp "%name.easy" "%name.secure" +#cp "%name.easy" "%name.paranoid" +#cat >"%name-agent.easy" <<-EOF +# %_libexecdir/x2go/x2gobroker-agent root.x2gobroker 04750 +#EOF +#cp "%name-agent.easy" "%name-agent.secure" +#cp "%name-agent.easy" "%name-agent.paranoid" +#popd %if 0%{?fdupes:1} %fdupes %buildroot/%_prefix %endif 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-93-gb8d0dbe
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via b8d0dbe19e2bb2c60a4708bbe1c2bb694fabb858 (commit) from 5133aa3b4983e32fe304a4b763e45ab40653a984 (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 b8d0dbe19e2bb2c60a4708bbe1c2bb694fabb858 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 14 01:36:02 2013 +0100 x2gobroker-daemon.init: improve stop script ----------------------------------------------------------------------- Summary of changes: init/x2gobroker-daemon.init | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) The diff of changes is: diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index d049d0a..e08921c 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -101,8 +101,7 @@ case "${1:-}" in if [ -f $PIDFILE_BROKER ] ; then log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "$(basename $DAEMON)" set +e - start-stop-daemon -K -p $PIDFILE_BROKER - rm -f $PIDFILE_BROKER + start-stop-daemon -K -p $PIDFILE_BROKER && rm -f $PIDFILE_BROKER log_end_msg $? set -e fi 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-94-ge32b5c9
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via e32b5c95715d9b993864154d9c9d887893921d03 (commit) from b8d0dbe19e2bb2c60a4708bbe1c2bb694fabb858 (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 e32b5c95715d9b993864154d9c9d887893921d03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 14 02:23:00 2013 +0100 Some minor fixes on the Debianic init scripts... ----------------------------------------------------------------------- Summary of changes: init/x2gobroker-authservice.init | 2 +- init/x2gobroker-daemon.init | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init index 79f23af..f34f5a0 100755 --- a/init/x2gobroker-authservice.init +++ b/init/x2gobroker-authservice.init @@ -64,7 +64,7 @@ is_true() case "${1:-}" in start) if [ -f $PIDFILE_AUTHSERVICE ]; then - if ps -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then + if ps a -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then log_warning_msg "X2Go Broker Authentication Service already running" else log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_AUTHSERVICE). Delete it manually!" diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index e08921c..932c3a8 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -12,7 +12,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: X2Go Session Broker standalone daemon -# Description: X2Go Session Broker daemon comes with its own HTTP daemon +# Description: X2Go Session Broker comes with its own HTTP daemon ### END INIT INFO # @@ -21,8 +21,8 @@ set -eu DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid -DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker -DEBIANCONFIG_DAEMON=/etc/default/x2gobroker-daemon +DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker +DEFAULTCONFIG_DAEMON=/etc/default/x2gobroker-daemon test -x "$DAEMON" || exit 0 @@ -38,8 +38,8 @@ X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= -test -f $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON -test -f $DEBIANCONFIG_DAEMON && . $DEBIANCONFIG_DAEMON +test -f $DEFAULTCONFIG_COMMON && . $DEFAULTCONFIG_COMMON +test -f $DEFAULTCONFIG_DAEMON && . $DEFAULTCONFIG_DAEMON if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then X2GOBROKER_DAEMON_USER=nobody @@ -82,7 +82,7 @@ is_true() case "${1:-}" in start) if [ -f $PIDFILE_BROKER ]; then - if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then + if ps a -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then log_warning_msg "X2Go Session Broker already running" else log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!" 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-95-g25328d4
by git-admin＠x2go.org 18 Dec '13

18 Dec '13

The branch, master has been updated via 25328d4ffcb3a9cd48be31558e2cad253cbcc298 (commit) from e32b5c95715d9b993864154d9c9d887893921d03 (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 25328d4ffcb3a9cd48be31558e2cad253cbcc298 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 14 02:24:59 2013 +0100 rpm/*.init: Provide initscripts that are likely to work on RHEL plus derivatives. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + rpm/x2gobroker-authservice.init | 157 +++++++++++++++++++++++++++++++++++++++ rpm/x2gobroker-daemon.init | 155 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 314 insertions(+) create mode 100644 rpm/x2gobroker-authservice.init create mode 100644 rpm/x2gobroker-daemon.init The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2939094..5a6e1c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low Apache2.4 / Apache2.2. * debian/source/format: + Switch to format 1.0. + * rpm/*.init: + + Provide initscripts that are likely to work on RHEL plus derivatives. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init new file mode 100644 index 0000000..cfba2dc --- /dev/null +++ b/rpm/x2gobroker-authservice.init @@ -0,0 +1,157 @@ +#!/bin/sh +# +# x2gobroker-authservice - Starts/stop the "x2gobroker-authservice" daemon +# +# chkconfig: 2345 99 1 +# description: Cleans the X2Go session database + +### BEGIN INIT INFO +# Provides: x2gobroker-authservice +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2345 +# Default-Stop: 016 +# Short-Description: X2Go Session Broker PAM Authentication Service +# Description: PAM authentication service for X2Go Session Broker +### END INIT INFO + +set -eu + +AUTHSERVICE=/usr/sbin/x2gobroker-authservice +test -d /run && RUNDIR=/run || RUNDIR=/var/run +DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker +DEFAULTCONFIG_AUTHSERVICE=/etc/default/x2gobroker-authservice + +test -x "$AUTHSERVICE" || exit 0 + +START_AUTHSERVICE=false +X2GOBROKER_DEBUG=0 +X2GOBROKER_DAEMON_USER='x2gobroker' +X2GOBROKER_DAEMON_GROUP='x2gobroker' +X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" +test -f $DEFAULTCONFIG_COMMON && . $DEFAULTCONFIG_COMMON +test -f $DEFAULTCONFIG_AUTHSERVICE && . $DEFAULTCONFIG_AUTHSERVICE + +if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then + X2GOBROKER_DAEMON_USER=nobody +fi +if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then + X2GOBROKER_DAEMON_GROUP=nogroup +fi + +export X2GOBROKER_DEBUG +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 +OPTS="-s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660" + +lockfile=/var/lock/subsys/$prog + + +is_true() +{ + case "${1:-}" in + [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; + *) return 1; + esac +} + + +start() { +[ -x $exec ] || exit 5 + if ps a -u root | grep $(basename $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=$? + set -e + echo + [ $retval -eq 0 ] && touch $lockfile + fi +} + + +stop() { + echo -n $"Stopping $prog: " + set +e + killproc $exec + retval=$? + set -e + echo + rm -f $lockfile +} + + +restart() { + stop + start +} + + +reload() { + restart +} + + +force_reload() { + restart +} + + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 + ;; +esac +exit $? + diff --git a/rpm/x2gobroker-daemon.init b/rpm/x2gobroker-daemon.init new file mode 100644 index 0000000..6915982 --- /dev/null +++ b/rpm/x2gobroker-daemon.init @@ -0,0 +1,155 @@ +#!/bin/sh +# +# x2gobroker-daemon - Starts/stop the "x2gobroker-daemon" daemon +# +# chkconfig: 2345 99 1 +# description: Cleans the X2Go session database + +### BEGIN INIT INFO +# Provides: x2gobroker-daemon +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2345 +# Default-Stop: 016 +# Short-Description: X2Go Session Broker Standalone Daemon +# Description: X2Go Session Broker comes with its own HTTP daemon +### END INIT INFO + +set -eu + +DAEMON=/usr/bin/x2gobroker +test -d /run && RUNDIR=/run || RUNDIR=/var/run +PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid +DEFAULTCONFIG_COMMON=/etc/default/python-x2gobroker +DEFAULTCONFIG_DAEMON=/etc/default/x2gobroker-daemon + +test -x "$DAEMON" || exit 0 + +START_BROKER=false +DAEMON_BIND_ADDRESS=127.0.0.1:8080 +X2GOBROKER_DEBUG=0 +X2GOBROKER_DAEMON_USER='x2gobroker' +X2GOBROKER_DAEMON_GROUP='x2gobroker' +X2GOBROKER_DEFAULT_BACKEND="zeroconf" +X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" +X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" +X2GOBROKER_SSL_CERTFILE= +X2GOBROKER_SSL_KEYFILE= +test -f $DEFAULTCONFIG_COMMON && . $DEFAULTCONFIG_COMMON +test -f $DEFAULTCONFIG_DAEMON && . $DEFAULTCONFIG_DAEMON + +if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then + X2GOBROKER_DAEMON_USER=nobody +fi +if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then + X2GOBROKER_DAEMON_GROUP=nogroup +fi + +# mend user ID variables when --chuid $X2GOBROKER_DAEMON_USER is used with start-stop-daemon +export LOGNAME=$X2GOBROKER_DAEMON_USER +export USER=$X2GOBROKER_DAEMON_USER +export USERNAME=$X2GOBROKER_DAEMON_USER + +export X2GOBROKER_DEBUG +export X2GOBROKER_DAEMON_USER +export X2GOBROKER_DAEMON_GROUP +export X2GOBROKER_CONFIG +export X2GOBROKER_DEFAULT_BACKEND +export X2GOBROKER_SESSIONPROFILES +export X2GOBROKER_AGENT_CMD +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 +OPTS="--mode HTTP -p \"$DAEMON_BIND_ADDRESS\"" + +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 + echo "X2Go Session Broker already running" + START_BROKER=no + fi + if is_true $START_BROKER; then + echo -n $"Starting $prog: " + set +e + su - $X2GOBROKER_DAEMON_USER -c "daemon $exec $OPTS" + retval=$? + set -e + echo + [ $retval -eq 0 ] && touch $lockfile + fi +} + +stop() { + echo -n $"Stopping $prog: " + killproc $exec + retval=$? + echo + rm -f $lockfile +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? + 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits