projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into staging
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
templates
/
default.bacula-fd.erb
diff --git
a/modules/bacula/templates/default.bacula-fd.erb
b/modules/bacula/templates/default.bacula-fd.erb
index
96b2455
..
3d9206f
100644
(file)
--- a/
modules/bacula/templates/default.bacula-fd.erb
+++ b/
modules/bacula/templates/default.bacula-fd.erb
@@
-9,12
+9,7
@@
ENABLED="yes"
# Additional start arguments can be provided here
ENABLED="yes"
# Additional start arguments can be provided here
-# ARGS=""
-<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%>
-ARGS=""
-<% else -%>
ARGS="-u bacula -k"
ARGS="-u bacula -k"
-<% end -%>
# Default config file can be changed here
# CONFIG="/etc/bacula/bacula-fd.conf"
# Default config file can be changed here
# CONFIG="/etc/bacula/bacula-fd.conf"