diff options
| author | varac <varacanero@zeromail.org> | 2016-02-24 09:18:31 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-02-24 09:18:31 +0100 |
| commit | 79e874c1a86ad5c48c4e726a5d4c68bd879ce454 (patch) | |
| tree | 97e0916feed9ecc764ef45f3578fee89ff0b0f5b | |
| parent | 3bb4d2667be274ba51eb3d8442e55c98789a4d76 (diff) | |
| parent | 996043d73fedd2ff7d8c58eec3d6a639a86ce623 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
| -rw-r--r-- | templates/service.conf.erb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/templates/service.conf.erb b/templates/service.conf.erb index d2fafaf..47f1c9d 100644 --- a/templates/service.conf.erb +++ b/templates/service.conf.erb @@ -3,8 +3,8 @@ ; puppet runs, please make configuration changes to this service in puppet ; Global configuration options -<%= 'debug = ' + debuglevel %> -<%= 'pid = ' + real_pid %> +<%= '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" -%> <%= v + " = " + instance_variable_get("@#{v}").to_s %> @@ -13,10 +13,10 @@ end -%> ; Some performance tunings -<% if socket.is_a? String -%> -<%= 'socket = ' + socket %> -<% elsif socket.is_a? Array -%> -<%= socket.map { |i| "socket = #{i}" }. join("\n") %> +<% if @socket.is_a? String -%> +<%= 'socket = ' + @socket %> +<% elsif @socket.is_a? Array -%> +<%= @socket.map { |i| "socket = #{i}" }. join("\n") %> <% end -%> <%- %w{output syslog}.each do |v| @@ -34,7 +34,7 @@ end -%> end -%> ; Service-level configuration -<%= '[' + name + ']' %> +<%= '[' + @name + ']' %> <%- %w{accept connect capath cafile cert ciphers crlpath crlfile delay enginenum exec execargs failover ident key local oscp ocspflag options protocol protocolauthentication protocolhost protocolpassword protocolusername pty retry session sslversion stack @@ -44,4 +44,4 @@ end -%> <%- end end -%> -client = <%= client ? 'yes' : 'no' %> +client = <%= @client ? 'yes' : 'no' %> |