This is all I currently want, as of tonight. The init scripts I do not care so much where they live, provided they are in the tar somewhere.
The following changes since commit a62fa864d38a7bad4938905782049d5d6af8d9bc:
Populate install target of Makefile. (Fixes: #201). (2013-05-15 10:15:23 +0200)
are available in the git repository at:
git://git.inai.de/x2gobroker master
for you to fetch changes up to 9a445ed1e0b9e1873079c2adb5c1d9865361969b:
build: also install defaults and manpages through make install (2013-05-15 22:49:36 +0200)
Jan Engelhardt (1):
build: also install defaults and manpages through make install
Makefile | 26 +++++++++++++++++----- ...x2gobroker.default => python-x2gobroker.default | 0 ...rvice.default => x2gobroker-authservice.default | 0 ...ker-daemon.default => x2gobroker-daemon.default | 0 4 files changed, 21 insertions(+), 5 deletions(-) rename debian/python-x2gobroker.default => python-x2gobroker.default (100%) rename debian/x2gobroker-authservice.default => x2gobroker-authservice.default (100%) rename debian/x2gobroker-daemon.default => x2gobroker-daemon.default (100%)
--- Makefile | 26 +++++++++++++++++++----- debian/python-x2gobroker.default | 38 ----------------------------------- debian/x2gobroker-authservice.default | 19 ------------------ debian/x2gobroker-daemon.default | 34 ------------------------------- python-x2gobroker.default | 38 +++++++++++++++++++++++++++++++++++ x2gobroker-authservice.default | 19 ++++++++++++++++++ x2gobroker-daemon.default | 34 +++++++++++++++++++++++++++++++ 7 files changed, 112 insertions(+), 96 deletions(-) delete mode 100644 debian/python-x2gobroker.default delete mode 100644 debian/x2gobroker-authservice.default delete mode 100644 debian/x2gobroker-daemon.default create mode 100644 python-x2gobroker.default create mode 100644 x2gobroker-authservice.default create mode 100644 x2gobroker-daemon.default diff --git a/Makefile b/Makefile index 02382e5..a30ea7b 100755 --- a/Makefile +++ b/Makefile @@ -78,7 +78,10 @@ install: # python-x2gobroker python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} - mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" + mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ + "${DESTDIR}/etc/default" + ${INSTALL_FILE} 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 \ @@ -87,13 +90,21 @@ install: ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" # x2gobroker-agent - mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" + mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ - "${DESTDIR}${ETCDIR}/broker" + "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_FILE} x2gobroker-authservice.default \ + "${DESTDIR}/etc/default/x2gobroker-authservice" + ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-authservice \ "${DESTDIR}/etc/logrotate.d/" @@ -101,7 +112,9 @@ install: "${DESTDIR}${ETCDIR}/broker/" # x2gobroker-daemon - mkdir -p "${DESTDIR}/etc/logrotate.d/" + mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" + ${INSTALL_FILE} x2gobroker-daemon.default \ + "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ "${DESTDIR}/etc/logrotate.d/" @@ -112,7 +125,10 @@ install: ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" # x2gobroker - mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" + mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \ "${DESTDIR}${SBINDIR}/" 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/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-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/python-x2gobroker.default b/python-x2gobroker.default new file mode 100644 index 0000000..67b93cb --- /dev/null +++ b/python-x2gobroker.default @@ -0,0 +1,38 @@ +# 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/x2gobroker-authservice.default b/x2gobroker-authservice.default new file mode 100644 index 0000000..e8b5f7b --- /dev/null +++ b/x2gobroker-authservice.default @@ -0,0 +1,19 @@ +# 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/x2gobroker-daemon.default b/x2gobroker-daemon.default new file mode 100644 index 0000000..0eb0a81 --- /dev/null +++ b/x2gobroker-daemon.default @@ -0,0 +1,34 @@ +# 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 -- 1.8.2
-
Jan Engelhardt