From a67e640a3658c3cadae9b0347fae86772ab89a96 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Tue, 9 Feb 2016 11:04:15 +0000 Subject: [PATCH] Systemd support perhaps finished... (#583) --- debian/control | 1 + debian/lemonldap-ng-fastcgi-server.service | 3 ++- debian/lemonldap-ng-fastcgi-server.upstart | 2 +- debian/rules | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 2c3a3d898..7f683ac67 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Uploaders: Xavier Guimard Section: perl Priority: extra Build-Depends: debhelper (>= 9), + dh-systemd, po-debconf Build-Depends-Indep: libapache-session-perl, libauthcas-perl, diff --git a/debian/lemonldap-ng-fastcgi-server.service b/debian/lemonldap-ng-fastcgi-server.service index 4d5c8abf2..bc33665aa 100644 --- a/debian/lemonldap-ng-fastcgi-server.service +++ b/debian/lemonldap-ng-fastcgi-server.service @@ -5,11 +5,12 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/default/lemonldap-ng-fastcgi-server -PIDFile=/var/run/llng-fastcgi-server/llng-fastcgi.pid +PIDFile=/var/run/llng-fastcgi-server/llng-fastcgi-server.pid ExecStart=/usr/sbin/llng-fastcgi-server ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID} KillMode=mixed [Install] +Alias=llng-fastcgi-server.service WantedBy=multi-user.target diff --git a/debian/lemonldap-ng-fastcgi-server.upstart b/debian/lemonldap-ng-fastcgi-server.upstart index 5239c3cd3..7df26c2e4 100644 --- a/debian/lemonldap-ng-fastcgi-server.upstart +++ b/debian/lemonldap-ng-fastcgi-server.upstart @@ -10,6 +10,6 @@ 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.pid +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 pre-stop exec /usr/sbin/nginx -s quit diff --git a/debian/rules b/debian/rules index cc50bda2b..cc146529e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ LMINIFILE=$(CONFDIR)/lemonldap-ng.ini CAPTCHADIR=$(LMVARDIR)/captcha %: - dh $@ + dh $@ --with systemd override_dh_auto_configure: $(MAKE) configure STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \