Side by Side Diff: modules/web/templates/site.erb
Issue 4884212985364480:
Allow running multiplexer on web servers (Closed)
Patch Set:
Created Dec. 18, 2013, 7:02 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/web/manifests/server.pp ('k')
|
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 server | 1 server |
| 2 { | 2 { |
| 3 listen 80 default_server; | 3 listen 80 default_server; |
| 4 listen [::]:80 default_server; | 4 listen [::]:80 default_server; |
| 5 server_name '<%= vhost %>'; | 5 server_name '<%= vhost %>'; |
| 6 | 6 |
| 7 location / | 7 location / |
| 8 { | 8 { |
| 9 rewrite (.*) https://<%= vhost %>$1 permanent; | 9 rewrite (.*) https://<%= vhost %>$1 permanent; |
| 10 } | 10 } |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 } | 76 } |
| 77 | 77 |
| 78 if (-f $document_root/$preferredLang$canonical) | 78 if (-f $document_root/$preferredLang$canonical) |
| 79 { | 79 { |
| 80 rewrite ^ /$preferredLang$canonical last; | 80 rewrite ^ /$preferredLang$canonical last; |
| 81 } | 81 } |
| 82 if (-f $document_root/en$canonical) | 82 if (-f $document_root/en$canonical) |
| 83 { | 83 { |
| 84 rewrite ^ /en$canonical last; | 84 rewrite ^ /en$canonical last; |
| 85 } | 85 } |
| 86 | |
| 87 <% if @multiplexer_locations %> | |
| 88 <% @multiplexer_locations.each do |location| %> | |
| 89 location <%= location %> | |
| 90 { | |
| 91 fastcgi_pass unix:/tmp/multiplexer-fastcgi.sock; | |
| 92 include /etc/nginx/fastcgi_params; | |
| 93 } | |
| 94 <% end %> | |
| 95 <% end %> | |
| 86 } | 96 } |
| OLD | NEW |
« no previous file with comments
|
« modules/web/manifests/server.pp ('k')
|
no next file »
|
no next file with comments »
