Left: | ||
Right: |
OLD | NEW |
---|---|
1 server { | 1 server { |
2 listen 80 default_server; | 2 <% if is_default %> |
3 listen [::]:80 default_server; | 3 listen 80 default_server; |
4 listen 443 ssl default_server; | 4 listen [::]:80 default_server; |
5 listen [::]:443 ssl default_server; | 5 listen 443 ssl default_server; |
6 listen [::]:443 ssl default_server; | |
7 <% else %> | |
8 listen 80; | |
Felix Dahlke
2014/01/30 13:51:48
I think it should be fine to always go with this v
Felix Dahlke
2014/01/30 13:58:02
I suppose it does make sense to be able to specify
Wladimir Palant
2014/01/30 14:11:36
No, normally there will be no default server - the
| |
9 listen [::]:80; | |
10 listen 443 ssl; | |
11 listen [::]:443 ssl; | |
12 <% end %> | |
6 | 13 |
7 server_name easylist-downloads.adblockplus.org easylist-msie.adblockplus.org; | 14 server_name easylist-downloads.adblockplus.org easylist-msie.adblockplus.org; |
8 access_log /var/log/nginx/access_log_easylist_downloads main; | 15 access_log /var/log/nginx/access_log_easylist_downloads main; |
9 root /var/www/easylist; | 16 root /var/www/easylist; |
10 keepalive_timeout 0; | 17 keepalive_timeout 0; |
11 charset utf-8; | 18 charset utf-8; |
12 gzip_static on; | 19 gzip_static on; |
13 default_type text/plain; | 20 default_type text/plain; |
14 | 21 |
15 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; | 22 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; |
16 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; | 23 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; |
17 | 24 |
18 set $id "$scheme:$http_host"; | 25 set $id "$scheme:$http_host"; |
19 if ($id = "http:easylist-downloads.adblockplus.org") { | 26 if ($id = "http:easylist-downloads.adblockplus.org") { |
20 rewrite (.*) https://$http_host$1 permanent; | 27 rewrite (.*) https://$http_host$1 permanent; |
21 } | 28 } |
22 | 29 |
23 error_page 403 404 https://easylist.adblockplus.org/; | 30 error_page 403 404 https://easylist.adblockplus.org/; |
24 | 31 |
25 # redirect server error pages to the static page /50x.html | 32 # redirect server error pages to the static page /50x.html |
26 # | 33 # |
27 error_page 500 502 503 504 /50x.html; | 34 error_page 500 502 503 504 /50x.html; |
28 location = /50x.html { | 35 location = /50x.html { |
29 root html; | 36 root html; |
30 } | 37 } |
31 } | 38 } |
OLD | NEW |