OLD | NEW |
1 root /var/www/<%= @vhost %>; | 1 # Puppet: <%= @title %> |
2 index index; | 2 |
| 3 root /var/www/<%= @domain %>; |
| 4 index index index.html; |
3 default_type text/html; | 5 default_type text/html; |
4 charset utf-8; | 6 charset utf-8; |
5 | 7 |
6 set $index_page "index"; | 8 set $index_page "index"; |
7 | 9 |
8 <% if @custom_config %> | 10 <% if @custom_config %> |
9 <%= @custom_config %> | 11 <%= @custom_config %> |
10 <% end %> | 12 <% end %> |
11 | 13 |
12 location / | 14 location / |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 | 70 |
69 location ~ ^/([a-z][a-z])(/.+) | 71 location ~ ^/([a-z][a-z])(/.+) |
70 { | 72 { |
71 if (!-e "$document_root$uri") | 73 if (!-e "$document_root$uri") |
72 { | 74 { |
73 # if there is no language translation, try canonical page for default langua
ge | 75 # if there is no language translation, try canonical page for default langua
ge |
74 # example /es/page -> /page | 76 # example /es/page -> /page |
75 rewrite ^/([a-z][a-z])(/.+) $2 redirect; | 77 rewrite ^/([a-z][a-z])(/.+) $2 redirect; |
76 } | 78 } |
77 } | 79 } |
78 | |
79 <% if @multiplexer_locations %> | |
80 <% @multiplexer_locations.each do |location| %> | |
81 location <%= location %> | |
82 { | |
83 fastcgi_pass unix:/tmp/multiplexer-fastcgi.sock; | |
84 include /etc/nginx/fastcgi_params; | |
85 } | |
86 <% end %> | |
87 <% end %> | |
OLD | NEW |