This is an automated email from the git hooks/post-receive script. xguimard-guest pushed a commit to branch master in repository lemonldap-ng.
commit 045ff000de1fc3c0557c28b42c8cb3bc1665389e Author: Xavier Guimard <x.guim...@free.fr> Date: Sun Mar 6 12:45:02 2016 +0100 Create /run/llng-fastcgi-server at startup --- debian/lemonldap-ng-fastcgi-server.init | 13 +++++++++++++ debian/lemonldap-ng-fastcgi-server.postinst | 17 ----------------- debian/lemonldap-ng-fastcgi-server.service | 2 ++ debian/lemonldap-ng-fastcgi-server.upstart | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/debian/lemonldap-ng-fastcgi-server.init b/debian/lemonldap-ng-fastcgi-server.init index 77c0d55..62a0f05 100755 --- a/debian/lemonldap-ng-fastcgi-server.init +++ b/debian/lemonldap-ng-fastcgi-server.init @@ -35,6 +35,19 @@ if [ -z "$SOCKET" ]; then SOCKET=/var/run/llng-fastcgi-server/llng-fastcgi.sock fi +for f in "$PID" "$SOCKET"; do + DIR=`dirname "$f"` + if [ ! -d "$DIR" ]; then + mkdir -p "$DIR" + if [ -n "$USER" ]; then + chown "$USER" "$DIR" + fi + if [ -n "$GROUP" ]; then + chgrp "$GROUP" "$DIR" + fi + fi +done + DAEMON_OPTS="-p ${PID} -u ${USER} -g ${GROUP} -s ${SOCKET}" if [ -z "$CUSTOM_FUNCTIONS_FILE" ]; then diff --git a/debian/lemonldap-ng-fastcgi-server.postinst b/debian/lemonldap-ng-fastcgi-server.postinst deleted file mode 100644 index cc7aaf1..0000000 --- a/debian/lemonldap-ng-fastcgi-server.postinst +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -USER="www-data" -GROUP="www-data" -CHOWN="/bin/chown" -ID="/usr/bin/id" - -if ! test -d /var/run/llng-fastcgi-server; then - rm -rf /var/run/llng-fastcgi-server - mkdir /var/run/llng-fastcgi-server -fi -$CHOWN $USER:$GROUP /var/run/llng-fastcgi-server - -#DEBHELPER# -exit 0 diff --git a/debian/lemonldap-ng-fastcgi-server.service b/debian/lemonldap-ng-fastcgi-server.service index c42d592..5c024ec 100644 --- a/debian/lemonldap-ng-fastcgi-server.service +++ b/debian/lemonldap-ng-fastcgi-server.service @@ -7,6 +7,8 @@ Documentation=http://lemonldap-ng.org/documentation/latest/fastcgiserver Type=forking EnvironmentFile=/etc/default/lemonldap-ng-fastcgi-server PIDFile=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid +ExecStartPre=-/bin/mkdir /var/run/llng-fastcgi-server +ExecStartPre=/bin/chown www-data:www-data /var/run/llng-fastcgi-server ExecStart=/usr/sbin/llng-fastcgi-server ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID} KillMode=mixed diff --git a/debian/lemonldap-ng-fastcgi-server.upstart b/debian/lemonldap-ng-fastcgi-server.upstart index 1326a48..46515f6 100644 --- a/debian/lemonldap-ng-fastcgi-server.upstart +++ b/debian/lemonldap-ng-fastcgi-server.upstart @@ -10,5 +10,5 @@ pre-start script [ -x /usr/sbin/llng-fastcgi-server ] || { stop; exit 0; } end script -exec /usr/sbin/llng-fastcgi-server -u www-data -g www-data -s /var/run/llng-fastcgi-server/llng-fastcgi.sock -p /var/run/llng-fastcgi-server/llng-fastcgi-server.pid +exec mkdir /var/run/llng-fastcgi-server; chown www-data:www-data /var/run/llng-fastcgi-server && /usr/sbin/llng-fastcgi-server -u www-data -g www-data -s /var/run/llng-fastcgi-server/llng-fastcgi.sock -p /var/run/llng-fastcgi-server/llng-fastcgi-server.pid -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits