[bacula] Redundant user/group in systemd. Already in sysconfig.
Simone Caronni
slaanesh at fedoraproject.org
Mon Dec 5 11:34:26 UTC 2011
commit 6872dfc864debb10acc0e982eadaf517ce342698
Author: Simone Caronni <negativo17 at gmail.com>
Date: Mon Dec 5 12:34:08 2011 +0100
Redundant user/group in systemd. Already in sysconfig.
bacula-dir.service | 2 --
bacula-fd.service | 2 --
bacula-sd.service | 2 --
bacula.spec | 3 +++
4 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/bacula-dir.service b/bacula-dir.service
index 2f044af..b3fecaa 100644
--- a/bacula-dir.service
+++ b/bacula-dir.service
@@ -5,8 +5,6 @@ After=network.target
[Service]
Environment=CONFIG=/etc/bacula/bacula-dir.conf
-Environment=DIR_USER=bacula
-Environment=DIR_GROUP=bacula
EnvironmentFile=-/etc/sysconfig/bacula-dir
ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
ExecStart=/usr/sbin/bacula-dir -f -c $CONFIG -u $DIR_USER -g $DIR_GROUP
diff --git a/bacula-fd.service b/bacula-fd.service
index 7185c2e..abd9e66 100644
--- a/bacula-fd.service
+++ b/bacula-fd.service
@@ -5,8 +5,6 @@ After=network.target
[Service]
Environment=CONFIG=/etc/bacula/bacula-fd.conf
-Environment=FD_USER=root
-Environment=FD_GROUP=root
EnvironmentFile=-/etc/sysconfig/bacula-fd
ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
ExecStart=/usr/sbin/bacula-fd -f -c $CONFIG -u $FD_USER -g $FD_GROUP
diff --git a/bacula-sd.service b/bacula-sd.service
index 57c851d..19847f0 100644
--- a/bacula-sd.service
+++ b/bacula-sd.service
@@ -5,8 +5,6 @@ After=network.target
[Service]
Environment=CONFIG=/etc/bacula/bacula-sd.conf
-Environment=SD_USER=bacula
-Environment=SD_GROUP=disk
EnvironmentFile=-/etc/sysconfig/bacula-sd
ExecStartPre=/usr/sbin/bacula-checkconf $CONFIG
ExecStart=/usr/sbin/bacula-sd -f -c $CONFIG -u $SD_USER -g $SD_GROUP
diff --git a/bacula.spec b/bacula.spec
index 5d35b15..a58e62d 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -818,6 +818,9 @@ fi
%changelog
+* Mon Dec 05 2011 Simone Caronni <negativo17 at gmail.com> - 5.2.2-5
+- Remove redundant user/group in service files.
+
* Thu Dec 02 2011 Simone Caronni <negativo17 at gmail.com> - 5.2.2-4
- Rename storage-common to storage and make it provide storage-common.
- Move bscan to director-common.
More information about the scm-commits
mailing list