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

Side by Side Diff: modules/nginx/templates/site.erb

Issue 5671492293492736: Issue 2611 - Log ABP-Notification-Version response header (Closed)
Patch Set: Created June 9, 2015, 12:38 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 <% include_file = lambda do |url| %> 1 <% include_file = lambda do |url| %>
2 <% content = Puppet::FileServing::Content.indirection.find(url) %> 2 <% content = Puppet::FileServing::Content.indirection.find(url) %>
3 <% if content %> 3 <% if content %>
4 <%= content.content %> 4 <%= content.content %>
5 <% else %> 5 <% else %>
6 <% raise StandardError, "Failed to resolve source URL #{url}" %> 6 <% raise StandardError, "Failed to resolve source URL #{url}" %>
7 <% end %> 7 <% end %>
8 <% end %> 8 <% end %>
9 9
10 <% server_name = lambda do |domain, alt_names| %><%= domain %><% @alt_names.each do |name| %>, <%= name %><% end %><% end %> 10 <% server_name = lambda do |domain, alt_names| %><%= domain %><% @alt_names.each do |name| %>, <%= name %><% end %><% end %>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 <% if is_default %> 55 <% if is_default %>
56 listen 80 default_server; 56 listen 80 default_server;
57 listen [::]:80 default_server; 57 listen [::]:80 default_server;
58 <% else %> 58 <% else %>
59 listen 80; 59 listen 80;
60 listen [::]:80; 60 listen [::]:80;
61 <% end %> 61 <% end %>
62 <% end %> 62 <% end %>
63 63
64 access_log /var/log/nginx/<%= log %> main; 64 access_log /var/log/nginx/<%= log %> <%= log_format %>;
65 65
66 # redirect server error pages to the static page /50x.html 66 # redirect server error pages to the static page /50x.html
67 # 67 #
68 error_page 500 502 503 504 /50x.html; 68 error_page 500 502 503 504 /50x.html;
69 location = /50x.html 69 location = /50x.html
70 { 70 {
71 root /usr/share/nginx/html; 71 root /usr/share/nginx/html;
72 } 72 }
73 73
74 <% if @content %> 74 <% if @content %>
75 <%= content %> 75 <%= content %>
76 <% end %> 76 <% end %>
77 77
78 <% if @source %> 78 <% if @source %>
79 <% include_file[source] %> 79 <% include_file[source] %>
80 <% end %> 80 <% end %>
81 } 81 }
OLDNEW

Powered by Google App Engine
This is Rietveld