Template fixes

diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb
index 87fd99629f2e241439ff0e92e49bb928c64c487e..e3e0e1174937de8f5323e3dee8af2a7091746cd1 100644 (file)
--- a/templates/puppetmaster.erb
+++ b/templates/puppetmaster.erb
@@ -4,13 +4,13 @@
 # service in Puppet.
 
 user www-data www-data;
-worker_processes  <%= $worker_processes %>;
+worker_processes  <%= worker_processes %>;
 
 error_log       /var/log/nginx-puppet.log notice;
 pid             /var/run/nginx-puppet.pid;
 
 events {
-    worker_connections  <%= $worker_connections %>;
+    worker_connections  <%= worker_connections %>;
 }
 
 http {
@@ -42,17 +42,17 @@ http {
     ssl_session_timeout     5m;
 
     upstream puppet-production {
-      <% $puppetmaster_servers.each do |upstream| -%>
+      <% puppetmaster_servers.each do |upstream| -%>
         server <%= upstream %>;
       <% end -%>
     }
 
     server {
-        listen                  <%= $ssl_port %>;
+        listen                  <%= ssl_port %>;
         ssl_verify_client       on;
         root                    /var/empty;
-        access_log              /var/log/nginx/access-<%= $ssl_port %>.log;
-        rewrite_log             /var/log/nginx/rewrite-<%= $ssl_port %>.log;
+        access_log              /var/log/nginx/access-<%= ssl_port %>.log;
+        rewrite_log             /var/log/nginx/rewrite-<%= ssl_port %>.log;
 
         # Variables
         # $ssl_cipher returns the line of those utilized it is cipher for established SSL-connection
@@ -75,11 +75,11 @@ http {
     }
 
     server {
-        listen                  <%= $nonssl_port %>;
+        listen                  <%= nonssl_port %>;
         ssl_verify_client       off;
         root                    /var/empty;
-        access_log              /var/log/nginx/access-<%= $nonssl_port %>.log;
-        rewrite_log             /var/log/nginx/rewrite-<%= $nonssl_port %>.log;
+        access_log              /var/log/nginx/access-<%= nonssl_port %>.log;
+        rewrite_log             /var/log/nginx/rewrite-<%= nonssl_port %>.log;
 
         location / {
             proxy_pass  http://puppet-production;