diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-17 18:38:12 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-17 18:38:12 -0200 |
| commit | b9b1773c9e2ef46ec002e0acaaea098626f04633 (patch) | |
| tree | 1faa60c6741f3a881a7bb404b3ce782305d5f946 | |
| parent | b7af3b1cca7905e34452b5681431ed1c9be58eb8 (diff) | |
| download | puppet-nginx-b9b1773c9e2ef46ec002e0acaaea098626f04633.tar.gz puppet-nginx-b9b1773c9e2ef46ec002e0acaaea098626f04633.tar.bz2 | |
Template fixes
| -rw-r--r-- | templates/puppetmaster.erb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb index 87fd996..e3e0e11 100644 --- 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; |