From b40fb93f9007874474111f987b964703272edb97 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Mon, 20 Jul 2015 14:22:20 -0700 Subject: [PATCH] Use instance variables in templates 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 --- templates/cgitrc.erb | 4 ++-- templates/httpd.conf.erb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/cgitrc.erb b/templates/cgitrc.erb index c951ba6..aec9d8f 100644 --- a/templates/cgitrc.erb +++ b/templates/cgitrc.erb @@ -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 -%> diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb index 8aa0c03..3a82363 100644 --- a/templates/httpd.conf.erb +++ b/templates/httpd.conf.erb @@ -99,8 +99,8 @@ KeepAliveTimeout 15 # MaxClients: maximum number of server processes allowed to start # MaxRequestsPerChild: maximum number of requests a server process serves -<% 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 -%> @@ -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 -<% 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 -%>