Side by Side Diff: modules/adblockplus/templates/web/static.conf.erb
Issue 29689695:
#7320 - Introduce helpcenter role (Closed)
Patch Set: Some improvements
Created Feb. 9, 2018, 1:37 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/web/static.pp ('k')
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 root /var/www/<%= @vhost %>; | 1 # Puppet: <%= @title %> |
| 2 | |
| 3 root /var/www/<%= @domain %>; | |
| 2 index index; | 4 index index; |
| 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 |
| (...skipping 56 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 |
« no previous file with comments
|
« modules/adblockplus/manifests/web/static.pp ('k')
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
no next file with comments »
