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

Delta Between Two Patch Sets: modules/updateserver/files/update.adblockplus.org

Issue 11439212: Add server21 as updateserver (Closed)
Left Patch Set: Created Aug. 16, 2013, 12:32 p.m.
Right Patch Set: Addressed issues Created Aug. 16, 2013, 2:07 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « modules/updateserver/files/logrotate ('k') | modules/updateserver/manifests/init.pp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 server { 1 server {
2 listen 80 default_server; 2 listen 80 default_server;
3 listen [::]:80 default_server; 3 listen [::]:80 default_server;
4 server_name update.adblockplus.org; 4 server_name update.adblockplus.org;
5 location / { 5 location / {
6 rewrite (.*) https://update.adblockplus.org$1 permanent; 6 rewrite (.*) https://update.adblockplus.org$1 permanent;
7 } 7 }
8 } 8 }
9 9
10 server { 10 server {
11 listen 443 ssl default_server; 11 listen 443 ssl default_server;
12 listen [::]:443 ssl default_server; 12 listen [::]:443 ssl default_server;
13 server_name update.adblockplus.org; 13 server_name update.adblockplus.org;
14 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 14 ssl_certificate sites-available/adblockplus.org_sslcert.pem;
15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; 15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
16 16
17 error_page 500 502 503 504 /50x.html; 17 error_page 500 502 503 504 /50x.html;
18 location = /50x.html { 18 location = /50x.html {
19 root html; 19 root html;
20 } 20 }
21 21
22 location /.hg {
23 internal;
24 }
Wladimir Palant 2013/08/16 13:11:02 Drop that? We don't have any Mercurial repository
Felix Dahlke 2013/08/16 14:07:53 Oops. Done.
25
26 access_log /var/log/nginx/access_log_update main; 22 access_log /var/log/nginx/access_log_update main;
27 keepalive_timeout 0; 23 keepalive_timeout 0;
28 root /var/www/update; 24 root /var/www/update;
29 } 25 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld