Browse files

Switch more symbols to strings and remove extra spaces

  • Loading branch information...
1 parent 06c38c2 commit 6a6322b6f578ac5d2186621527fb9e6a362bfc5c @tas50 tas50 committed with Oct 20, 2012
Showing with 12 additions and 12 deletions.
  1. +12 −12 templates/default/chef_server.nginx.conf.erb
View
24 templates/default/chef_server.nginx.conf.erb
@@ -3,26 +3,26 @@ upstream chef_server {
}
upstream chef_server_webui {
- server 127.0.0.1:<%= node['chef_server']['webui_port'] %> fail_timeout=0;
+ server 127.0.0.1:<%= node['chef_server']['webui_port'] %> fail_timeout=0;
}
server {
listen <%= @api_port %> ssl;
ssl_certificate /etc/chef/certificates/chef-server-proxy.pem;
ssl_certificate_key /etc/chef/certificates/chef-server-proxy.pem;
server_name <%= @api_server_name %>;
- access_log <%= node[:nginx][:log_dir] %>/chef-server.access.log;
- error_log <%= node[:nginx][:log_dir] %>/chef-server.error.log warn;
+ access_log <%= node['nginx']['log_dir'] %>/chef-server.access.log;
+ error_log <%= node['nginx']['log_dir'] %>/chef-server.error.log warn;
root <%= node['chef_server']['doc_root'] %>;
-
+
location @chef_server {
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_pass http://chef_server;
}
-
+
location / {
try_files $uri @chef_server;
}
@@ -31,9 +31,9 @@ server {
<% if @api_aliases && @api_aliases.length > 0 %>
server {
server_name <%= @api_aliases.join(' ') %>;
- access_log <%= node[:nginx][:log_dir] %>/chef-server.access.log;
- error_log <%= node[:nginx][:log_dir] %>/chef-server.error.log warn;
-
+ access_log <%= node['nginx']['log_dir'] %>/chef-server.access.log;
+ error_log <%= node['nginx']['log_dir'] %>/chef-server.error.log warn;
+
rewrite ^(.+)$ https://<%= @api_server_name %>$1 permanent;
}
@@ -48,7 +48,7 @@ server {
error_log <%= node[:nginx][:log_dir] %>/chef-server.error.log warn;
root <%= node['chef_server']['doc_root'] %>;
-
+
location @chef_server_webui {
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
@@ -76,9 +76,9 @@ server {
<% if @webui_aliases && @webui_aliases.length > 0 %>
server {
server_name <%= @webui_aliases.join(' ') %>;
- access_log <%= node[:nginx][:log_dir] %>/chef-server.access.log;
- error_log <%= node[:nginx][:log_dir] %>/chef-server.error.log warn;
-
+ access_log <%= node['nginx']['log_dir'] %>/chef-server.access.log;
+ error_log <%= node['nginx']['log_dir'] %>/chef-server.error.log warn;
+
rewrite ^(.+)$ https://<%= @webui_server_name %>$1 permanent;
}

0 comments on commit 6a6322b

Please sign in to comment.