From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 12:59:00 +0000 (-0200)
Subject: Fixing variable scopes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ffeb6f2240bf27bdddd1496e68bbd2de82ceb591;p=puppet-nginx.git

Fixing variable scopes
---

diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb
index 6b3e2a6..8b568d4 100644
--- a/templates/puppetmaster.erb
+++ b/templates/puppetmaster.erb
@@ -4,10 +4,10 @@
 # service in Puppet.
 
 server {
-    listen                       <%= ssl_port %>;
+    listen                       <%= scope.lookupvar('nginx::puppetmaster::ssl_port') %>;
     ssl_verify_client            on;
     root                         /var/empty;
-    access_log                   /var/log/nginx/access-<%= ssl_port %>.log;
+    access_log                   /var/log/nginx/access-<%= scope.lookupvar('nginx:puppetmaster::ssl_port') %>.log;
     rewrite_log                  on;
     large_client_header_buffers  16 4k;
 
@@ -38,7 +38,7 @@ server {
 }
 
 server {
-    listen                       <%= non_ssl_port %>;
+    listen                       <%= scope.lookupvar('nginx::puppetmaster::non_ssl_port') %>;
     ssl_verify_client            off;
     root                         /var/empty;
     access_log                   /var/log/nginx/access-<%= non_ssl_port %>.log;