projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use systemd::override instead of manual bacula-fd.service.d/user.conf
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
client.pp
diff --git
a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index
2918a79
..
d016e0d
100644
(file)
--- a/
modules/bacula/manifests/client.pp
+++ b/
modules/bacula/manifests/client.pp
@@
-51,23
+51,24
@@
class bacula::client inherits bacula {
notify => Service['bacula-fd'],
}
if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
notify => Service['bacula-fd'],
}
if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
- file { '/etc/systemd/system/bacula-fd.service.d':
- ensure => directory,
- mode => '0755',
- owner => root,
- group => root,
- }
+ # old name for the override content
file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
- source => 'puppet:///modules/bacula/bacula-fd-systemd',
- mode => '0400',
- owner => root,
- group => root,
- notify => Exec['systemctl daemon-reload'],
+ ensure => absent,
+ }
+ systemd::override { 'bacula-fd':
+ content => @(EOT)
+ [Service]
+ ExecStart=
+ ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+ | EOT
}
} else {
file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
ensure => absent,
}
}
} else {
file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
ensure => absent,
}
+ systemd::override { 'bacula-fd':
+ ensure => absent,
+ }
}
@ferm::rule { 'dsa-bacula-fd-v4':
}
@ferm::rule { 'dsa-bacula-fd-v4':