Side by Side Diff: modules/web/templates/global.conf.erb
Issue 4894914248704000:
Issue 254 - Switch from wildcard certificate to certificates for individual hosts (Closed)
Patch Set:
Created April 10, 2014, 9 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 <% if @aliases %> | 1 <% if @aliases %> |
| 2 <% @aliases.each do |vhost_alias| %> | 2 <% @aliases.each do |vhost_alias| %> |
| 3 server | 3 server |
| 4 { | 4 { |
| 5 listen 80; | 5 listen 80; |
| 6 listen [::]:80; | 6 listen [::]:80; |
| 7 listen 443 ssl spdy; | 7 listen 443 ssl spdy; |
| 8 listen [::]:443 ssl spdy; | 8 listen [::]:443 ssl spdy; |
| 9 | 9 |
| 10 server_name '<%= vhost_alias %>'; | 10 server_name '<%= vhost_alias %>'; |
| 11 | 11 |
| 12 ssl_certificate adblockplus.org_sslcert.pem; | 12 ssl_certificate <%= certificate %>; |
| 13 ssl_certificate_key adblockplus.org_sslcert.key; | 13 ssl_certificate_key <%= private_key %>; |
| 14 | 14 |
| 15 location / | 15 location / |
| 16 { | 16 { |
| 17 rewrite .* https://<%= vhost %>/ redirect; | 17 rewrite .* https://<%= vhost %>/ redirect; |
| 18 } | 18 } |
| 19 } | 19 } |
| 20 <% end %> | 20 <% end %> |
| 21 <% end %> | 21 <% end %> |
| OLD | NEW |
« no previous file with comments
|
« modules/web/manifests/server.pp ('k')
|
no next file »
|
no next file with comments »
