Merge pull request #27 from BioIQ/fix-temp-deprecations

Fix template deprecation warnings generated in puppet 3
puppetlabs-toy-chest · Jul 10, 2013 · 5a838b7 · 5a838b7
2 parents e880286 + 05262c5
commit 5a838b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/templates/passenger-conf.erb b/templates/passenger-conf.erb
@@ -1,6 +1,6 @@
-LoadModule passenger_module <%= gem_path %>/passenger-<%= passenger_version %>/ext/apache2/mod_passenger.so
-PassengerRoot <%= gem_path %>/passenger-<%= passenger_version %>
-PassengerRuby <%= passenger_ruby %>
+LoadModule passenger_module <%= @gem_path %>/passenger-<%= @passenger_version %>/ext/apache2/mod_passenger.so
+PassengerRoot <%= @gem_path %>/passenger-<%= @passenger_version %>
+PassengerRuby <%= @passenger_ruby %>
 
 # you probably want to tune these settings
 PassengerHighPerformance on

diff --git a/templates/passenger-enabled.erb b/templates/passenger-enabled.erb
@@ -1,5 +1,5 @@
 <IfModule mod_passenger.c>
-	PassengerRoot <%= gem_path %>/passenger-<%= passenger_version %>
+	PassengerRoot <%= @gem_path %>/passenger-<%= @passenger_version %>
 	PassengerRuby /usr/bin/ruby
 
 	# you probably want to tune these settings

diff --git a/templates/passenger-load.erb b/templates/passenger-load.erb
@@ -1 +1 @@
-LoadModule passenger_module <%= gem_path %>/passenger-<%= passenger_version %>/ext/apache2/mod_passenger.so
+LoadModule passenger_module <%= @gem_path %>/passenger-<%= @passenger_version %>/ext/apache2/mod_passenger.so