This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit dc605f96aa13918e01b3bc9511339b80a216263a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 17:32:42 2018 +0200 tmpfiles.d utilization: Create RUNDIR/x2gobroker via tmpfiles.d system. Fixes missing dir and flawed permissions when running under systemd. --- Makefile | 18 +++++++++++++----- tmpfiles.d/x2gobroker-authservice.conf | 2 ++ tmpfiles.d/x2gobroker-daemon.conf | 2 ++ tmpfiles.d/x2gobroker-loadchecker.conf | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a6ab80e..1e198e1 100755 --- a/Makefile +++ b/Makefile @@ -39,8 +39,9 @@ ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +DATADIR ?= $(PREFIX)/share +MANDIR=$(DATADIR)/man +SHAREDIR=$(DATADIR)/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -102,7 +103,7 @@ install: # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ @@ -112,11 +113,13 @@ install: "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-authservice.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-loadchecker mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-loadchecker.default \ "${DESTDIR}/etc/default/x2gobroker-loadchecker" ${INSTALL_FILE} man/man8/x2gobroker-loadchecker.8* \ @@ -126,9 +129,12 @@ install: "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-loadchecker-logger.conf \ "${DESTDIR}${ETCDIR}/broker/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-loadchecker.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-daemon - mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" + mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" \ + "$(DESTDIR)$(DATADIR)/tmpfiles.d/" ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ @@ -143,6 +149,8 @@ install: "${DESTDIR}${BINDIR}/x2gobroker-daemon" ${INSTALL_PROGRAM} sbin/x2gobroker-daemon-debug \ "${DESTDIR}${SBINDIR}/" + ${INSTALL_FILE} tmpfiles.d/x2gobroker-daemon.conf \ + "${DESTDIR}${DATADIR}/tmpfiles.d/" # x2gobroker-ssh mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ diff --git a/tmpfiles.d/x2gobroker-authservice.conf b/tmpfiles.d/x2gobroker-authservice.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-authservice.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - diff --git a/tmpfiles.d/x2gobroker-daemon.conf b/tmpfiles.d/x2gobroker-daemon.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-daemon.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - diff --git a/tmpfiles.d/x2gobroker-loadchecker.conf b/tmpfiles.d/x2gobroker-loadchecker.conf new file mode 100644 index 0000000..ab98b13 --- /dev/null +++ b/tmpfiles.d/x2gobroker-loadchecker.conf @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /run/x2gobroker 0770 x2gobroker x2gobroker - - -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git