From 60d8e25da5b7d9203a4c4dfc014b33e51e142afb Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Mon, 7 Mar 2016 06:11:14 +0000
Subject: [PATCH] Use native tmpfiles.d for systemd (#969)

---
 debian/lemonldap-ng-fastcgi-server.service           | 3 +--
 debian/lemonldap-ng-fastcgi-server.tmpfile           | 1 +
 debian/liblemonldap-ng-common-perl.lintian-overrides | 2 ++
 fastcgi-server/systemd/llng-fastcgi-server.service   | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 debian/lemonldap-ng-fastcgi-server.tmpfile

diff --git a/debian/lemonldap-ng-fastcgi-server.service b/debian/lemonldap-ng-fastcgi-server.service
index 19dc6cfd1..c42d59282 100644
--- a/debian/lemonldap-ng-fastcgi-server.service
+++ b/debian/lemonldap-ng-fastcgi-server.service
@@ -1,13 +1,12 @@
 [Unit]
 Description=FastCGI server for Lemonldap::NG websso system
 After=network.target
+Documentation=http://lemonldap-ng.org/documentation/latest/fastcgiserver
 
 [Service]
 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.tmpfile b/debian/lemonldap-ng-fastcgi-server.tmpfile
new file mode 100644
index 000000000..1d2088ac5
--- /dev/null
+++ b/debian/lemonldap-ng-fastcgi-server.tmpfile
@@ -0,0 +1 @@
+d	/run/llng-fastcgi-server	0755	www-data	www-data	-	-
diff --git a/debian/liblemonldap-ng-common-perl.lintian-overrides b/debian/liblemonldap-ng-common-perl.lintian-overrides
index 042f46fc2..4e91d2aa7 100644
--- a/debian/liblemonldap-ng-common-perl.lintian-overrides
+++ b/debian/liblemonldap-ng-common-perl.lintian-overrides
@@ -11,3 +11,5 @@ liblemonldap-ng-common-perl: non-standard-file-perm var/lib/lemonldap-ng/conf/lm
 # directory, so it must not be readable by all but must be writable by www-data
 liblemonldap-ng-common-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
 liblemonldap-ng-common-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
+liblemonldap-ng-common-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/ 0770 != 0755
+liblemonldap-ng-common-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/lock/ 0770 != 0755
diff --git a/fastcgi-server/systemd/llng-fastcgi-server.service b/fastcgi-server/systemd/llng-fastcgi-server.service
index 6c0e429d2..330a10359 100644
--- a/fastcgi-server/systemd/llng-fastcgi-server.service
+++ b/fastcgi-server/systemd/llng-fastcgi-server.service
@@ -6,8 +6,6 @@ After=network.target
 Type=forking
 EnvironmentFile=/etc/default/llng-fastcgi-server
 PIDFile=__FASTCGISOCKDIR__/llng-fastcgi-server.pid
-ExecStartPre=-/bin/mkdir __FASTCGISOCKDIR__
-ExecStartPre=/bin/chown __USER__:__GROUP__ __FASTCGISOCKDIR__
 ExecStart=__SBINDIR__/llng-fastcgi-server
 ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile ${PID}
 KillMode=mixed