Side by Side Diff: modules/filterserver/files/easylist-downloads.adblockplus.org
Issue 9545004:
Merged easylist-downloads and easylist-msie configurations (Closed)
Patch Set:
Created March 4, 2013, 8:15 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/filterserver/files/inc.easylist-downloads » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 # Default | 1 # Default |
| 2 server { | 2 server { |
| 3 listen [::]:80; | 3 listen [::]:80; |
| 4 listen [::]:443 ssl; | 4 listen [::]:443 ssl; |
| 5 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; | 5 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; |
| 6 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; | 6 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; |
| 7 location / { | 7 location / { |
| 8 rewrite (.*) $scheme://adblockplus.org$1 permanent; | 8 rewrite (.*) $scheme://adblockplus.org$1 permanent; |
| 9 } | 9 } |
| 10 } | 10 } |
| 11 # easylist-downloads.adblockplus.org | 11 # easylist-downloads.adblockplus.org |
| 12 server { | 12 server { |
| 13 listen [::]:80; | 13 listen [::]:80; |
| 14 server_name easylist-downloads.adblockplus.org; | 14 server_name easylist-downloads.adblockplus.org; |
| 15 location / { | 15 location / { |
| 16 rewrite (.*) https://easylist-downloads.adblockplus.org$1 permanent; | 16 rewrite (.*) https://easylist-downloads.adblockplus.org$1 permanent; |
| 17 } | 17 } |
| 18 } | 18 } |
| 19 server { | 19 server { |
| 20 listen [::]:443 ssl; | 20 listen [::]:443 ssl; |
| 21 server_name easylist-downloads.adblockplus.org; | 21 server_name easylist-downloads.adblockplus.org; |
| 22 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; | 22 ssl_certificate sites-available/easylist-downloads.adblockplus.org_sslcert.pem ; |
| 23 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; | 23 ssl_certificate_key sites-available/easylist-downloads.adblockplus.org_sslcert .key; |
| 24 include "sites-available/inc.easylist-downloads"; | 24 include "sites-available/inc.easylist-downloads"; |
| 25 include "sites-available/inc.easylist-downloads-txt"; | |
| 26 } | 25 } |
| 27 server { | 26 server { |
| 28 listen [::]:80; | 27 listen [::]:80; |
| 29 server_name easylist-msie.adblockplus.org; | 28 server_name easylist-msie.adblockplus.org; |
| 30 include "sites-available/inc.easylist-downloads"; | 29 include "sites-available/inc.easylist-downloads"; |
| 31 include "sites-available/inc.easylist-downloads-tpl"; | |
| 32 } | 30 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/filterserver/files/inc.easylist-downloads » ('j')
|
no next file with comments »
