Delta Between Two Patch Sets: hiera/roles/web/adblockbrowser.yaml
Issue 29793587:
#11421 - Redirect broken links on adblockbrowser.org (Closed)
Left Patch Set: For comment 3 + removing duplicated entries
Created May 30, 2018, 7:15 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.
« 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') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 23 matching lines...) Expand all Loading... | |
| 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 ^/android/? https://adblockplus.org/forum/viewforum.php?f=15 perma nent; | 38 rewrite ^/android/? https://adblockplus.org/forum/viewforum.php?f=15 perma nent; |
| 39 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; |
| 40 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; |
| 41 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; |
| 42 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; |
| 43 location ~ /forum/view(forum|topic) { | 43 location ~ /forum/view(forum|topic) { |
| 44 rewrite ^(.*)/(forum)/(view(forum|topic)) https://adblockplus.org/$2/$3.p hp permanent; | 44 rewrite ^/forum/view(forum|topic) https://adblockplus.org/forum/view$1.ph p permanent; |
|
mathias
2018/05/30 21:15:40
Please improve on that regular expression. There s
| |
| 45 } | 45 } |
| 46 location /submit-feedback { | 46 location /submit-feedback { |
| 47 proxy_pass http://127.0.0.1:8000; | 47 proxy_pass http://127.0.0.1:8000; |
| 48 proxy_set_header User-Agent $http_user_agent; | 48 proxy_set_header User-Agent $http_user_agent; |
| 49 proxy_set_header Referer $http_referer; | 49 proxy_set_header Referer $http_referer; |
| 50 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | 50 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; |
| 51 proxy_set_header Accept-Language $http_accept_language; | 51 proxy_set_header Accept-Language $http_accept_language; |
| 52 proxy_set_header Host $http_host; | 52 proxy_set_header Host $http_host; |
| 53 proxy_set_header X-Client-Id $http_x_client_id; | 53 proxy_set_header X-Client-Id $http_x_client_id; |
| 54 } | 54 } |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 78 sitescripts::configfragments: | 78 sitescripts::configfragments: |
| 79 installation_link: | 79 installation_link: |
| 80 content: | | 80 content: | |
| 81 [DEFAULT] | 81 [DEFAULT] |
| 82 mailer=/usr/sbin/sendmail | 82 mailer=/usr/sbin/sendmail |
| 83 [multiplexer] | 83 [multiplexer] |
| 84 sitescripts.send_installation_link.web.send_installation_link = | 84 sitescripts.send_installation_link.web.send_installation_link = |
| 85 [send_installation_link] | 85 [send_installation_link] |
| 86 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl | 86 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl |
| 87 | 87 |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
