diff options
| author | Micah Anderson <micah@riseup.net> | 2009-11-11 19:31:19 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-11-11 19:31:19 -0500 |
| commit | a7659da65aeaad7d0c4aaf89e6150b8ed260f751 (patch) | |
| tree | 8c538afbf7ab7718a8410272847cea1f35276422 | |
| parent | b1547e09ecffde921ee9b0e7bb418fd68bb6ab13 (diff) | |
its a mistake to use the puppet keyword 'debug', changed to use the
original 'debuglevel' and fixed the template
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/service.conf.erb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0609fb6..f3fa0d2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,7 +28,7 @@ class stunnel { $cafile = false, $cert = false, $chroot = false, $ciphers = false, $client = false, $compress = false, $connect = false, $crlpath = false, $crlfile - = false, $debug = false, $delay = false, $egd = + = false, $debuglevel = false, $delay = false, $egd = false, $engine = false, $engineCtrl = false, $enginenum = false, $exec = false, $execargs = false, $failover = false, $ident = false, $key = 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' %> - |