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

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

Issue 6231623137755136: Issue 2605 - Redirect legacy update URLs (Closed)
Patch Set: Created May 28, 2015, 11:40 a.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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 if ($user_agent != "") 63 if ($user_agent != "")
64 { 64 {
65 set $index_page $user_agent; 65 set $index_page $user_agent;
66 } 66 }
67 67
68 # Various redirects 68 # Various redirects
69 69
70 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent; 70 rewrite ^/(\w\w(_\w\w)?/)?changelog-1.3.1$ /$1\changelog-1.3 permanent;
71 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent; 71 rewrite ^/downloads/(.*) https://downloads.adblockplus.org/$1 permanent;
72 72
73 rewrite ^/update.rdf$ https://update.adblockplus.org/gecko/update.rdf permanent;
74 rewrite ^/updates.plist$ https://update.adblockplus.org/adblockplussafari/update s.plist permanent;
75 rewrite ^/androidupdate.json$ https://update.adblockplus.org/adblockplusandroid/ update.json permanent;
76 rewrite ^/androidupdate.xml$ https://update.adblockplus.org/adblockplusandroid/u pdates.xml permanent;
Felix Dahlke 2015/05/28 11:50:35 Isn't that androidupdates.xml, with an s?
Wladimir Palant 2015/05/28 11:57:44 You are right, I somehow mistyped this despite get
77 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.jso n permanent;
78
73 location /redirect 79 location /redirect
74 { 80 {
75 if ($arg_link = "reporter_connect_issue") 81 if ($arg_link = "reporter_connect_issue")
76 { 82 {
77 rewrite ^ /forum/? redirect; 83 rewrite ^ /forum/? redirect;
78 } 84 }
79 if ($arg_link = "reporter_other_link") 85 if ($arg_link = "reporter_other_link")
80 { 86 {
81 rewrite ^ /forum/? redirect; 87 rewrite ^ /forum/? redirect;
82 } 88 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 location /403.html 230 location /403.html
225 { 231 {
226 try_files $uri @proxied; 232 try_files $uri @proxied;
227 } 233 }
228 location @proxied 234 location @proxied
229 { 235 {
230 proxy_pass https://server_16.adblockplus.org; 236 proxy_pass https://server_16.adblockplus.org;
231 proxy_set_header Host adblockplus.org; 237 proxy_set_header Host adblockplus.org;
232 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 238 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
233 } 239 }
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