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

Delta Between Two Patch Sets: hiera/roles/web/adblockbrowser.yaml

Issue 29793587: #11421 - Redirect broken links on adblockbrowser.org (Closed)
Left Patch Set: Created May 29, 2018, 10:31 p.m.
Right Patch Set: For comment 5 Created May 30, 2018, 9:43 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 | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 classes: 1 classes:
2 adblockplus::web::mimeo: 2 adblockplus::web::mimeo:
3 format: $remote_addr - - [$time_local] "$request" $status $bytes_sent "$http _referer" "$http_user_agent" "$http_x_forwarded_for" - "$http_accept_language" " $http_host" "$http_x_client_id" $http_content_length "$http_content_type" $reque st_body 3 format: $remote_addr - - [$time_local] "$request" $status $bytes_sent "$http _referer" "$http_user_agent" "$http_x_forwarded_for" - "$http_accept_language" " $http_host" "$http_x_client_id" $http_content_length "$http_content_type" $reque st_body
4 response: All good, carry on! 4 response: All good, carry on!
5 port: 8000 5 port: 8000
6 web::server: 6 web::server:
7 vhost: adblockbrowser.org 7 vhost: adblockbrowser.org
8 aliases: 8 aliases:
9 - www.adblockbrowser.org 9 - www.adblockbrowser.org
10 is_default: true 10 is_default: true
(...skipping 17 matching lines...) Expand all
28 rewrite ^/zh-CN/?$ https://adblockbrowser.org/zh_CN/ permanent; 28 rewrite ^/zh-CN/?$ https://adblockbrowser.org/zh_CN/ permanent;
29 rewrite ^/android-support/removing-filter-list/?$ https://adblockplus.org/ forum/viewforum.php?f=15 permanent; 29 rewrite ^/android-support/removing-filter-list/?$ https://adblockplus.org/ forum/viewforum.php?f=15 permanent;
30 rewrite ^/ios-support/install/?$ https://adblockplus.org/forum/viewforum.p hp?f=26 permanent; 30 rewrite ^/ios-support/install/?$ https://adblockplus.org/forum/viewforum.p hp?f=26 permanent;
31 rewrite ^/android-support/display-options/?^ https://adblockplus.org/forum /viewforum.php?f=15 permanent; 31 rewrite ^/android-support/display-options/?^ https://adblockplus.org/forum /viewforum.php?f=15 permanent;
32 rewrite ^/blog/?$ https://adblockplus.org/blog/ permanent; 32 rewrite ^/blog/?$ https://adblockplus.org/blog/ permanent;
33 rewrite ^/zh-CN/android-support/customizing-abb/?$ https://adblockplus.org /forum/viewforum.php?f=15 permanent; 33 rewrite ^/zh-CN/android-support/customizing-abb/?$ https://adblockplus.org /forum/viewforum.php?f=15 permanent;
34 rewrite ^/pt-BR/android-support/acceptable-ads-config/?$ https://adblockpl us.org/forum/viewforum.php?f=15 permanent; 34 rewrite ^/pt-BR/android-support/acceptable-ads-config/?$ https://adblockpl us.org/forum/viewforum.php?f=15 permanent;
35 rewrite ^/es-ES/android-support/changing-language/?$ https://adblockplus.o rg/forum/viewforum.php?f=15 permanent; 35 rewrite ^/es-ES/android-support/changing-language/?$ https://adblockplus.o rg/forum/viewforum.php?f=15 permanent;
36 rewrite ^/es-ES/android-support/removing-filter-list/?$ https://adblockplu s.org/forum/viewforum.php?f=15 permanent; 36 rewrite ^/es-ES/android-support/removing-filter-list/?$ https://adblockplu s.org/forum/viewforum.php?f=15 permanent;
37 rewrite ^/index.html https://adblockbrowser.org/ permanent; 37 rewrite ^/index.html https://adblockbrowser.org/ permanent;
38 rewrite ^/ios-support/?$ https://adblockplus.org/forum/viewforum.php?f=26 permanent;
39 rewrite ^/android/? https://adblockplus.org/forum/viewforum.php?f=15 perma nent; 38 rewrite ^/android/? https://adblockplus.org/forum/viewforum.php?f=15 perma nent;
40 rewrite ^/zh-CN/android-support/?$ https://adblockplus.org/forum/viewforum .php?f=15 permanent;
41 rewrite ^/pt-PT/android-support/?$ https://adblockplus.org/forum/viewforum .php?f=15 permanent; 39 rewrite ^/pt-PT/android-support/?$ https://adblockplus.org/forum/viewforum .php?f=15 permanent;
42 rewrite ^/ios-support/removing-filter-list/?$ https://adblockplus.org/foru m/viewforum.php?f=26 permanent; 40 rewrite ^/ios-support/removing-filter-list/?$ https://adblockplus.org/foru m/viewforum.php?f=26 permanent;
43 rewrite ^/zh-CN/android-support/adding-filter-list/?$ https://adblockplus. org/forum/viewforum.php?f=15 permanent; 41 rewrite ^/zh-CN/android-support/adding-filter-list/?$ https://adblockplus. org/forum/viewforum.php?f=15 permanent;
44 rewrite ^/zh-TW/ios-support/install/?$ https://adblockplus.org/forum/viewf orum.php?f=26 permanent; 42 rewrite ^/zh-TW/ios-support/install/?$ https://adblockplus.org/forum/viewf orum.php?f=26 permanent;
45 location /forum/viewforum { 43 location ~ /forum/view(forum|topic) {
mathias 2018/05/30 07:45:28 Can't we just re-write all /forum/viewforum and /f
f.lopez 2018/05/30 19:03:41 Yes we can, I did it this way to make it as verbos
46 if ($arg_f = "22") 44 rewrite ^/forum/view(forum|topic) https://adblockplus.org/forum/view$1.ph p permanent;
47 {
48 rewrite ^(.*)/?$ https://adblockplus.org/forum/viewforum.php permanent ;
49 }
50 }
51 location /forum/viewtopic {
52 set $arguments $arg_f/$arg_t/$arg_start;
53 if ($arguments = "2/40190/")
54 {
55 rewrite ^(.*) https://adblockplus.org/forum/viewtopic.php permanent;
56 }
57 if ($arguments = "2/36849/")
58 {
59 rewrite ^(.*) https://adblockplus.org/forum/viewtopic.php permanent;
60 }
61 if ($arguments = "1/23617/")
62 {
63 rewrite ^(.*) https://adblockplus.org/forum/viewtopic.php permanent;
64 }
65 if ($arguments = "9/40312/")
66 {
67 rewrite ^(.*) https://adblockplus.org/forum/viewtopic.php permanent;
68 }
69 if ($arguments = "18/21550/15")
70 {
71 rewrite ^(.*) https://adblockplus.org/forum/viewtopic.php permanent;
72 }
73 } 45 }
74 location /submit-feedback { 46 location /submit-feedback {
75 proxy_pass http://127.0.0.1:8000; 47 proxy_pass http://127.0.0.1:8000;
76 proxy_set_header User-Agent $http_user_agent; 48 proxy_set_header User-Agent $http_user_agent;
77 proxy_set_header Referer $http_referer; 49 proxy_set_header Referer $http_referer;
78 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 50 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
79 proxy_set_header Accept-Language $http_accept_language; 51 proxy_set_header Accept-Language $http_accept_language;
80 proxy_set_header Host $http_host; 52 proxy_set_header Host $http_host;
81 proxy_set_header X-Client-Id $http_x_client_id; 53 proxy_set_header X-Client-Id $http_x_client_id;
82 } 54 }
(...skipping 23 matching lines...) Expand all
106 sitescripts::configfragments: 78 sitescripts::configfragments:
107 installation_link: 79 installation_link:
108 content: | 80 content: |
109 [DEFAULT] 81 [DEFAULT]
110 mailer=/usr/sbin/sendmail 82 mailer=/usr/sbin/sendmail
111 [multiplexer] 83 [multiplexer]
112 sitescripts.send_installation_link.web.send_installation_link = 84 sitescripts.send_installation_link.web.send_installation_link =
113 [send_installation_link] 85 [send_installation_link]
114 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl 86 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl
115 87
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld