Apply Aurelien's nfs patch to the dsa-check-libs copy in puppet also

[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 c20fc35e2faf731e0e53545315a14260ffc82642..96b2455c9a9c59f8530a8b0bd23208b321cec527 100644 (file)
--- a/modules/bacula/templates/default.bacula-fd.erb
+++ b/modules/bacula/templates/default.bacula-fd.erb
@@ -1,3 +1,7 @@
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
 # defaults file for bacula-fd
 
 # Service can be disabled by setting
@@ -5,10 +9,12 @@
 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=""
-# We should make it be:
-#ARGS="-u bacula -k"
-# once bug #683080 is fixed
+<% else -%>
+ARGS="-u bacula -k"
+<% end -%>
 
 # Default config file can be changed here
 # CONFIG="/etc/bacula/bacula-fd.conf"