[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.2.0-13-g1120e90
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:47 CEST 2013
The branch, build-main has been updated
via 1120e90923542f62c7e897de178afbf45e052e77 (commit)
from 65d635943bb2a8580eae0f04be99dcd3e5c9605c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +
debian/python-x2gobroker.default | 39 +------
debian/x2gobroker-authservice.default | 20 +---
debian/x2gobroker-authservice.init | 106 +----------------
debian/x2gobroker-daemon.default | 35 +-----
debian/x2gobroker-daemon.init | 121 +-------------------
{debian => defaults}/python-x2gobroker.default | 0
.../x2gobroker-authservice.default | 0
{debian => defaults}/x2gobroker-daemon.default | 0
{debian => init}/x2gobroker-authservice.init | 0
{debian => init}/x2gobroker-daemon.init | 0
11 files changed, 7 insertions(+), 316 deletions(-)
mode change 100644 => 120000 debian/python-x2gobroker.default
mode change 100644 => 120000 debian/x2gobroker-authservice.default
mode change 100755 => 120000 debian/x2gobroker-authservice.init
mode change 100644 => 120000 debian/x2gobroker-daemon.default
mode change 100755 => 120000 debian/x2gobroker-daemon.init
copy {debian => defaults}/python-x2gobroker.default (100%)
copy {debian => defaults}/x2gobroker-authservice.default (100%)
copy {debian => defaults}/x2gobroker-daemon.default (100%)
copy {debian => init}/x2gobroker-authservice.init (100%)
copy {debian => init}/x2gobroker-daemon.init (100%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 038afcd..b39fc37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
- Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to
x2gobroker-agent.pl during build via defining a macro in the Makefile.
Thanks to Richard Weinberger for spotting this!!!
+ * Provide init scripts and *.default files outside of /debian folder (as
+ they are also relevant for non-Debian packaging.
[ Jan Engelhardt ]
* New upstream version (0.0.2.1):
diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default
deleted file mode 100644
index 67b93cb..0000000
--- a/debian/python-x2gobroker.default
+++ /dev/null
@@ -1,38 +0,0 @@
-# X2Go Broker Session Broker (common) configuration for Debian
-
-# The posix user/group ID the broker runs under (do not change!)
-# if you change those nonetheless, make sure that the log file
-# directory (default: /var/log/x2gobroker) and files in there are
-# writable by that user
-#X2GOBROKER_DAEMON_USER=x2gobroker
-#X2GOBROKER_DAEMON_GROUP=x2gobroker
-
-# The posix user under which the x2gobroker-agent can be launched on
-# remote X2Go Servers.
-#X2GOBROKER_AGENT_USER=x2gobroker
-
-# Control debug mode (0=disable, 1=enable).
-#
-# Apart from verbose logging in /var/log/x2gobroker/*.log, this will
-# also make the broker available through http GET method requests
-# (otherwise: POST method requests only) and you will be able to test
-# the broker through your web browser
-#
-# This value has an effect on all (Python-based) X2Go Session Broker
-# services and can be overridden in /etc/default/x2gobroker-* files.
-#X2GOBROKER_DEBUG=0
-
-# Default X2Go Session Broker backend (available: zeroconf, inifile)
-#X2GOBROKER_DEFAULT_BACKEND=zeroconf
-
-# Path to the X2Go Session Broker's configuration file
-#X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf
-
-# Path to the X2Go Session Broker's session profiles file (when using the inifile backend)
-#X2GOBROKER_SESSIONPROFILES=/etc/x2go/broker/x2gobroker-sessionprofiles.conf
-
-# Path to the X2Go Session Broker's agent command
-#X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent
-
-# The unix socket file for communication between the broker and the authentication service.
-#X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket
diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default
new file mode 120000
index 0000000..04a50d2
--- /dev/null
+++ b/debian/python-x2gobroker.default
@@ -0,0 +1 @@
+../defaults/python-x2gobroker.default
\ No newline at end of file
diff --git a/debian/x2gobroker-authservice.default b/debian/x2gobroker-authservice.default
deleted file mode 100644
index e8b5f7b..0000000
--- a/debian/x2gobroker-authservice.default
+++ /dev/null
@@ -1,19 +0,0 @@
-# X2Go Session Broker (PAM Authentication Service) configuration for Debian
-
-# For PAM authentication the X2Go Session Broker needs its authentication
-# service. The session broker itself runs as a non-privileged user (see below)
-# whereas the authentication service must run as super-user root.
-#
-# If you do not use PAM as authentication mechanism with the X2Go Session Broker,
-# you can disable the authentication service here.
-START_AUTHSERVICE=true
-
-# Control debug mode (0=disable, 1=enable) of the X2Go Broker Authentication
-# Service.
-#
-# Logging is (by default) written to /var/log/x2gobroker/*log.
-#
-# This option can also be configured in /etc/default/python-x2go.
-# The value configured here overrides the value from python-x2go
-# defaults and only sets the x2gobroker-authservice into debug mode.
-#X2GOBROKER_DEBUG=0
diff --git a/debian/x2gobroker-authservice.default b/debian/x2gobroker-authservice.default
new file mode 120000
index 0000000..cb42293
--- /dev/null
+++ b/debian/x2gobroker-authservice.default
@@ -0,0 +1 @@
+../defaults/x2gobroker-authservice.default
\ No newline at end of file
diff --git a/debian/x2gobroker-authservice.init b/debian/x2gobroker-authservice.init
deleted file mode 100755
index 56efcb7..0000000
--- a/debian/x2gobroker-authservice.init
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# Start the X2Go Session Broker PAM Authentication Service
-#
-# Copyright © 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-# Distributable under the terms of the GNU AGPL version 2.
-#
-### BEGIN INIT INFO
-# Provides: x2gobroker-authservice
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# 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
-PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid
-DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker
-DEBIANCONFIG_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 $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON
-test -f $DEBIANCONFIG_AUTHSERVICE && . $DEBIANCONFIG_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
-
-# create PID directory
-mkdir -p $RUNDIR/x2gobroker
-chown $X2GOBROKER_DAEMON_USER:$X2GOBROKER_DAEMON_GROUP $RUNDIR/x2gobroker
-chmod 0770 $RUNDIR/x2gobroker
-
-export X2GOBROKER_DEBUG
-export X2GOBROKER_DAEMON_USER
-export X2GOBROKER_DAEMON_GROUP
-export X2GOBROKER_AUTHSERVICE_SOCKET
-
-. /lib/lsb/init-functions
-
-is_true()
-{
- case "${1:-}" in
- [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;;
- *) return 1;
- esac
-}
-
-case "${1:-}" in
- start)
- if [ -f $PIDFILE_AUTHSERVICE ]; then
- if ps -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!"
- fi
- START_AUTHSERVICE=no
- fi
- if is_true $START_AUTHSERVICE; then
- set +e
- # once we are here, we have to make sure the authservice.socket does not exist
- rm -f $X2GOBROKER_AUTHSERVICE_SOCKET
- # and now we can start the auth service
- log_daemon_msg "Starting X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)"
- start-stop-daemon -b -m -S -p $PIDFILE_AUTHSERVICE -x $AUTHSERVICE -- -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660
- set -e
- log_end_msg $?
- fi
- ;;
- stop)
- if [ -f $PIDFILE_AUTHSERVICE ] ; then
- log_daemon_msg "Stopping X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)"
- set +e
- start-stop-daemon -K -p $PIDFILE_AUTHSERVICE
- rm -f $PIDFILE_AUTHSERVICE
- log_end_msg $?
- set -e
- fi
- ;;
- restart|reload|force-reload)
- ${0:-} stop
- ${0:-} start
- ;;
- *)
- echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/x2gobroker-authservice.init b/debian/x2gobroker-authservice.init
new file mode 120000
index 0000000..60f39ca
--- /dev/null
+++ b/debian/x2gobroker-authservice.init
@@ -0,0 +1 @@
+../init/x2gobroker-authservice.init
\ No newline at end of file
diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default
deleted file mode 100644
index 0eb0a81..0000000
--- a/debian/x2gobroker-daemon.default
+++ /dev/null
@@ -1,34 +0,0 @@
-# X2Go Session Broker configuration for Debian
-
-# Uncomment to enable the X2Go Session Broker standalone daemon
-START_BROKER=true
-
-# Bind standalone daemon to this address:port
-#DAEMON_BIND_ADDRESS=127.0.0.1:8080
-
-# Control debug mode (0=disable, 1=enable).
-#
-# Apart from verbose logging in /var/log/x2gobroker/*.log, this will
-# also make the broker available through http GET method requests
-# (otherwise: POST method requests only) and you will be able to
-# test the broker through your web browser.
-#
-# This option can also be configured in /etc/default/python-x2go.
-# The value configured here overrides the value from python-x2go
-# defaults and only sets the x2gobroker-daemon into debug mode.
-#X2GOBROKER_DEBUG=0
-
-##########################################################
-### ###
-### Enable SSL Support ###
-### o You have to create your own SSL certificates ###
-### o You have to actively uncomment the below SSL ###
-### relevant line to enable https:// in x2gobroker ###
-### ###
-##########################################################
-
-# SSL certificate file
-#X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt
-
-# SSL key file (ensure permissions are set to root:x2gobroker:0640)
-#X2GOBROKER_SSL_KEYFILE=/etc/x2go/broker/ssl/broker.key
diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default
new file mode 120000
index 0000000..8ec44b7
--- /dev/null
+++ b/debian/x2gobroker-daemon.default
@@ -0,0 +1 @@
+../defaults/x2gobroker-daemon.default
\ No newline at end of file
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
deleted file mode 100755
index 0a8b90a..0000000
--- a/debian/x2gobroker-daemon.init
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-#
-# Start the X2Go Session Broker standalone daemon
-#
-# Copyright © 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-# Distributable under the terms of the GNU AGPL version 2.
-#
-### BEGIN INIT INFO
-# Provides: x2gobroker-daemon
-# Required-Start: $remote_fs $syslog x2gobroker-authservice
-# Required-Stop: $remote_fs $syslog
-# 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
-### END INIT INFO
-#
-
-set -eu
-
-DAEMON=/usr/sbin/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
-
-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 $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON
-test -f $DEBIANCONFIG_DAEMON && . $DEBIANCONFIG_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
-
-# create PID directory
-mkdir -p $RUNDIR/x2gobroker
-chown $X2GOBROKER_DAEMON_USER:$X2GOBROKER_DAEMON_GROUP $RUNDIR/x2gobroker
-chmod 0770 $RUNDIR/x2gobroker
-
-# 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
-
-. /lib/lsb/init-functions
-
-is_true()
-{
- case "${1:-}" in
- [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;;
- *) return 1;
- esac
-}
-
-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
- log_warning_msg "X2Go Session Broker already running"
- else
- log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!"
- fi
- START_BROKER=no
- fi
- if is_true $START_BROKER; then
- log_daemon_msg "Starting X2Go Session Broker standalone daemon" "$(basename $DAEMON)"
- set +e
- start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- -b $DAEMON_BIND_ADDRESS
- log_end_msg $?
- set -e
- fi
- ;;
- stop)
- 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
- log_end_msg $?
- set -e
- fi
- ;;
- restart|reload|force-reload)
- ${0:-} stop
- ${0:-} start
- ;;
- *)
- echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
new file mode 120000
index 0000000..2c5f82e
--- /dev/null
+++ b/debian/x2gobroker-daemon.init
@@ -0,0 +1 @@
+../init/x2gobroker-daemon.init
\ No newline at end of file
diff --git a/debian/python-x2gobroker.default b/defaults/python-x2gobroker.default
similarity index 100%
copy from debian/python-x2gobroker.default
copy to defaults/python-x2gobroker.default
diff --git a/debian/x2gobroker-authservice.default b/defaults/x2gobroker-authservice.default
similarity index 100%
copy from debian/x2gobroker-authservice.default
copy to defaults/x2gobroker-authservice.default
diff --git a/debian/x2gobroker-daemon.default b/defaults/x2gobroker-daemon.default
similarity index 100%
copy from debian/x2gobroker-daemon.default
copy to defaults/x2gobroker-daemon.default
diff --git a/debian/x2gobroker-authservice.init b/init/x2gobroker-authservice.init
similarity index 100%
copy from debian/x2gobroker-authservice.init
copy to init/x2gobroker-authservice.init
diff --git a/debian/x2gobroker-daemon.init b/init/x2gobroker-daemon.init
similarity index 100%
copy from debian/x2gobroker-daemon.init
copy to init/x2gobroker-daemon.init
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).
More information about the x2go-commits
mailing list