Side by Side Diff: modules/web/templates/site.conf.erb
Issue 29465620:
#1574 - Update template syntax in web module (Closed)
Patch Set:
Created June 14, 2017, 12:42 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
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 root /var/www/<%= @vhost %>; |
| 2 index index; | 2 index index; |
| 3 default_type text/html; | 3 default_type text/html; |
| 4 charset utf-8; | 4 charset utf-8; |
| 5 | 5 |
| 6 set $index_page "index"; | 6 set $index_page "index"; |
| 7 | 7 |
| 8 <% if @custom_config %> | 8 <% if @custom_config %> |
| 9 <%= custom_config %> | 9 <%= @custom_config %> |
| 10 <% end %> | 10 <% end %> |
| 11 | 11 |
| 12 location / | 12 location / |
| 13 { | 13 { |
| 14 expires 1d; | 14 expires 1d; |
| 15 | 15 |
| 16 # Match Accept-Language header against available languages | 16 # Match Accept-Language header against available languages |
| 17 | 17 |
| 18 set $preferredLang en; | 18 set $preferredLang en; |
| 19 set $preferredRegion ""; | 19 set $preferredRegion ""; |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 50 | 50 |
| 51 <% if @multiplexer_locations %> | 51 <% if @multiplexer_locations %> |
| 52 <% @multiplexer_locations.each do |location| %> | 52 <% @multiplexer_locations.each do |location| %> |
| 53 location <%= location %> | 53 location <%= location %> |
| 54 { | 54 { |
| 55 fastcgi_pass unix:/tmp/multiplexer-fastcgi.sock; | 55 fastcgi_pass unix:/tmp/multiplexer-fastcgi.sock; |
| 56 include /etc/nginx/fastcgi_params; | 56 include /etc/nginx/fastcgi_params; |
| 57 } | 57 } |
| 58 <% end %> | 58 <% end %> |
| 59 <% end %> | 59 <% end %> |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
