opendev/puppet-cgit
Code Issues Proposed changes

Use instance variables in templates

Browse Source 
Refering to manifest variables via method calls has been deprecated for
some time and breaks in puppet 4. This patch changes the remaining
variable references in templates to use ruby instance variables.

Change-Id: Ib8265da9699f9f34b4a3185930c9dbfe8fe44733
This commit is contained in:
Colleen Murphy 2015-07-20 14:22:20 -07:00
parent 067a6dd39c
commit b40fb93f90
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/cgitrc.erb
View File

@ -2,6 +2,6 @@
# See cgitrc(5) or /usr/share/doc/cgit-*/cgitrc.5.html for details
#
<% final_cgitrc_settings.keys.sort.each do |setting| -%>
<%= setting -%>=<%= final_cgitrc_settings[setting] %>
<% @final_cgitrc_settings.keys.sort.each do |setting| -%>
<%= setting -%>=<%= @final_cgitrc_settings[setting] %>
<% end -%>

8
templates/httpd.conf.erb
View File

@ -99,8 +99,8 @@ KeepAliveTimeout 15
# MaxClients: maximum number of server processes allowed to start
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule prefork.c>
<% final_prefork_settings.keys.sort.each do |setting| -%>
<%= setting -%> <%= final_prefork_settings[setting] %>
<% @final_prefork_settings.keys.sort.each do |setting| -%>
<%= setting -%> <%= @final_prefork_settings[setting] %>
<% end -%>
</IfModule>
@ -112,8 +112,8 @@ KeepAliveTimeout 15
# ThreadsPerChild: constant number of worker threads in each server process
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule worker.c>
<% final_mpm_settings.keys.sort.each do |setting| -%>
<%= setting -%> <%= final_mpm_settings[setting] %>
<% @final_mpm_settings.keys.sort.each do |setting| -%>
<%= setting -%> <%= @final_mpm_settings[setting] %>
<% end -%>
</IfModule>