Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: modules/web/templates/global.conf.erb

Issue 29326028: Issue 2999 - Integrate web::server SSL parameters with Hiera (Closed)
Left Patch Set: Issue 2999 - Now the correct patch-set Created Sept. 7, 2015, 10:46 a.m.
Right Patch Set: Issue 2999 - Recognize HTTP/S when dealing with host aliases Created Sept. 7, 2015, 1:21 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « modules/web/manifests/server.pp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 server_name '<%= vhost_alias %>';
6 listen [::]:80;
7 listen 443 ssl spdy;
8 listen [::]:443 ssl spdy;
9 6
10 server_name '<%= vhost_alias %>'; 7 listen 80;
8 listen [::]:80;
9 <%- if @certificate != @private_key %>
10 listen 443 ssl spdy;
11 listen [::]:443 ssl spdy;
11 12
12 ssl_certificate <%= certificate %>; 13 ssl_certificate <%= @certificate %>;
13 ssl_certificate_key <%= private_key %>; 14 ssl_certificate_key <%= @private_key %>;
14 15
15 location / 16 location /
16 { 17 {
17 rewrite .* https://<%= vhost %>/ redirect; 18 rewrite .* https://<%= @vhost %>/ redirect;
18 } 19 }
19 } 20 <%- else %>
20 <% end %> 21
21 <% end %> 22 location /
23 {
24 rewrite .* http://<%= @vhost %>/ redirect;
25 }
26 <%- end %>
27 }
28 <%- end %>
29 <%- end %>
30
LEFTRIGHT
« modules/web/manifests/server.pp ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld