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

Side by Side Diff: modules/web/templates/adblockplus.org.conf.erb

Issue 29326137: Issue 3013 - Redirect /adblock-browser to adblockbrowser.org (Closed)
Patch Set: Created Sept. 8, 2015, 2:54 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # XSS and clickjacking prevention headers 1 # XSS and clickjacking prevention headers
2 2
3 set $csp_frame ""; 3 set $csp_frame "";
4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$) 4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$)
5 { 5 {
6 set $csp_frame "; frame-src www.youtube-nocookie.com;"; 6 set $csp_frame "; frame-src www.youtube-nocookie.com;";
7 } 7 }
8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame"; 8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame";
9 add_header X-Frame-Options "sameorigin"; 9 add_header X-Frame-Options "sameorigin";
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent; 81 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent;
82 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent; 82 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent;
83 83
84 rewrite ^/update.rdf$ https://update.adblockplus.org/gecko/update.rdf permanent; 84 rewrite ^/update.rdf$ https://update.adblockplus.org/gecko/update.rdf permanent;
85 rewrite ^/updates.plist$ https://update.adblockplus.org/adblockplussafari/update s.plist permanent; 85 rewrite ^/updates.plist$ https://update.adblockplus.org/adblockplussafari/update s.plist permanent;
86 rewrite ^/androidupdate.json$ https://update.adblockplus.org/adblockplusandroid/ update.json permanent; 86 rewrite ^/androidupdate.json$ https://update.adblockplus.org/adblockplusandroid/ update.json permanent;
87 rewrite ^/androidupdates.xml$ https://update.adblockplus.org/adblockplusandroid/ updates.xml permanent; 87 rewrite ^/androidupdates.xml$ https://update.adblockplus.org/adblockplusandroid/ updates.xml permanent;
88 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.jso n permanent; 88 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.jso n permanent;
89 89
90 rewrite ^/(\w\w(_\w\w)?/)?adblock-browser/?$ https://adblockbrowser.org/ permane nt;
91
90 location /redirect 92 location /redirect
91 { 93 {
92 if ($arg_link = "reporter_connect_issue") 94 if ($arg_link = "reporter_connect_issue")
93 { 95 {
94 rewrite ^ /forum/? redirect; 96 rewrite ^ /forum/? redirect;
95 } 97 }
96 if ($arg_link = "reporter_other_link") 98 if ($arg_link = "reporter_other_link")
97 { 99 {
98 rewrite ^ /forum/? redirect; 100 rewrite ^ /forum/? redirect;
99 } 101 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 location /403.html 271 location /403.html
270 { 272 {
271 try_files $uri @proxied; 273 try_files $uri @proxied;
272 } 274 }
273 location @proxied 275 location @proxied
274 { 276 {
275 proxy_pass https://server16.adblockplus.org; 277 proxy_pass https://server16.adblockplus.org;
276 proxy_set_header Host adblockplus.org; 278 proxy_set_header Host adblockplus.org;
277 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 279 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
278 } 280 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld