summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-11-11 19:31:19 -0500
committerMicah Anderson <micah@riseup.net>2009-11-11 19:31:19 -0500
commita7659da65aeaad7d0c4aaf89e6150b8ed260f751 (patch)
tree8c538afbf7ab7718a8410272847cea1f35276422 /templates
parentb1547e09ecffde921ee9b0e7bb418fd68bb6ab13 (diff)
its a mistake to use the puppet keyword 'debug', changed to use the
original 'debuglevel' and fixed the template
Diffstat (limited to 'templates')
-rw-r--r--templates/service.conf.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/service.conf.erb b/templates/service.conf.erb
index 84b8f17..d2fafaf 100644
--- a/templates/service.conf.erb
+++ b/templates/service.conf.erb
@@ -3,6 +3,7 @@
; puppet runs, please make configuration changes to this service in puppet
; Global configuration options
+<%= 'debug = ' + debuglevel %>
<%= 'pid = ' + real_pid %>
<%- %w{chroot setuid setgid service compression}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
@@ -18,7 +19,7 @@ end -%>
<%= socket.map { |i| "socket = #{i}" }. join("\n") %>
<% end -%>
-<%- %w{debug output syslog}.each do |v|
+<%- %w{output syslog}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
<%= v + " = " + instance_variable_get("@#{v}").to_s %>
<%-
@@ -44,4 +45,3 @@ end -%>
end
end -%>
client = <%= client ? 'yes' : 'no' %>
-