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

Side by Side Diff: modules/notificationserver/templates/notification.adblockplus.org.erb

Issue 5302563972841472: Merge filter and notification servers, have both tasks run on the same servers (Closed)
Patch Set: Stopped misusing is_default parameter Created Jan. 30, 2014, 2:10 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 # notification.adblockplus.org 1 # notification.adblockplus.org
2 server { 2 server {
3 listen 80 default_server; 3 <% if is_default %>
4 listen [::]:80 default_server; 4 listen 80 default_server;
5 listen [::]:80 default_server;
6 <% else %>
7 listen 80;
8 listen [::]:80;
9 <% end %>
10
5 server_name notification.adblockplus.org; 11 server_name notification.adblockplus.org;
6 location / { 12 location / {
7 rewrite (.*) https://notification.adblockplus.org$1 permanent; 13 rewrite (.*) https://notification.adblockplus.org$1 permanent;
8 } 14 }
9 } 15 }
10 server { 16 server {
11 listen 443 ssl default_server; 17 <% if is_default %>
12 listen [::]:443 ssl default_server; 18 listen 443 ssl default_server;
19 listen [::]:443 ssl default_server;
20 <% else %>
21 listen 443 ssl;
22 listen [::]:443 ssl;
23 <% end %>
24
13 server_name notification.adblockplus.org; 25 server_name notification.adblockplus.org;
14 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 26 ssl_certificate sites-available/adblockplus.org_sslcert.pem;
15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; 27 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
16 28
17 # redirect server error pages to the static page /50x.html 29 # redirect server error pages to the static page /50x.html
18 # 30 #
19 error_page 500 502 503 504 /50x.html; 31 error_page 500 502 503 504 /50x.html;
20 location = /50x.html { 32 location = /50x.html {
21 root html; 33 root html;
22 } 34 }
23 35
24 location /.hg { 36 location /.hg {
25 internal; 37 internal;
26 } 38 }
27 39
28 access_log /var/log/nginx/access_log_notification main; 40 access_log /var/log/nginx/access_log_notification main;
29 keepalive_timeout 0; 41 keepalive_timeout 0;
30 root /var/www/notification; 42 root /var/www/notification;
31 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld