[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-2-2-g5b7963d

[Alexander Golovko]

The following commit has been merged in the master branch:
commit d077cd3c71734828b635f8605c8411f6cd86b6f6
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Jul 3 11:46:20 2012 +0400

    Fix pid_dir and daemons user/group for systemd

diff --git a/debian/changelog b/debian/changelog
index 5f4433e..ae03863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bacula (5.2.6+dfsg-3) unstable; urgency=low
+
+  [ Alexander Golovko ]
+  * debian/rules:
+    + fix daemons user/group on systems with systemd (Closes: #679958).
+    + fix pid directory on systems with systemd.
+
+ --
+
 bacula (5.2.6+dfsg-2) unstable; urgency=low
 
   * debian/bacula-*.init:
diff --git a/debian/rules b/debian/rules
index c37a1e1..6d144b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,12 @@ CONF_ALL	= \
 	--with-db-name=XXX_DBNAME_XXX \
 	--with-db-user=XXX_DBUSER_XXX \
 	--with-db-password=XXX_DBPASSWORD_XXX \
+	--with-dir-user=bacula \
+	--with-dir-group=bacula \
+	--with-fd-user=root \
+	--with-fd-group=root \
+	--with-sd-user=bacula \
+	--with-sd-group=tape \
 	--config-cache \
 	--with-archivedir=/nonexistant/path/to/file/archive/dir \
 	--sysconfdir=/etc/bacula \
@@ -41,7 +47,7 @@ CONF_ALL	= \
 	--sharedstatedir=/var/lib/bacula \
 	--localstatedir=/var/lib/bacula \
 	--with-logdir=/var/log/bacula \
-	--with-pid-dir=/var/run/bacula \
+	--with-pid-dir=/run/bacula \
 	--with-smtp-host=localhost \
 	--with-working-dir=/var/lib/bacula \
 	--with-subsys-dir=/var/lock \

-- 
Bacula, a network backup, recovery and verification program