Reverting "update template to get rid of older (and unreliable) helper functions...

Revert "update template to get rid of older (and unreliable) helper functions, these can lead to odd results when variables are explicitly set to undef, and should be avoided"

This reverts commit fbbcc3580bf337478e587db6a688e4b3efee3292.

diff --git a/templates/service.conf.erb b/templates/service.conf.erb
index cdf5542..d2fafaf 100644 (file)
--- a/templates/service.conf.erb
+++ b/templates/service.conf.erb
@@ -6,8 +6,8 @@
 <%= 'debug = ' + debuglevel %>
 <%= 'pid = ' + real_pid %>
 <%- %w{chroot setuid setgid service compression}.each do |v|
-    if @v -%>
-<%= v + " = " + @v %>
+    if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
+<%= v + " = " + instance_variable_get("@#{v}").to_s %>
 <%-
        end
 end -%>
@@ -20,15 +20,15 @@ end -%>
 <% end -%>
 
 <%- %w{output syslog}.each do |v|
-    if @v -%>
-<%= v + " = " + @v %>
+    if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
+<%= v + " = " + instance_variable_get("@#{v}").to_s %>
 <%-
        end
 end -%>
 
 <%- %w{egd engine enginectrl rndbytes rndfile rndoverwrite}.each do |v|
-    if @v -%>
-<%= v + " = " + @v %>
+    if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
+<%= v + " = " + instance_variable_get("@#{v}").to_s %>
 <%-
        end
 end -%>
@@ -39,8 +39,8 @@ end -%>
        execargs failover ident key local oscp ocspflag options protocol protocolauthentication
        protocolhost protocolpassword protocolusername pty retry session sslversion stack 
        timeoutbusy timeoutclose timeoutconnect timeoutidle transparent verify}.each do |v|
-    if @v -%>
-<%= v + ' = ' + @v %>
+    if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
+<%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
     end
 end -%>