Side by Side Diff: hiera/roles/web/adblockbrowser.yaml
Issue 29793587:
#11421 - Redirect broken links on adblockbrowser.org (Closed)
Patch Set: For comment 3 + removing duplicated entries
Created May 30, 2018, 7:15 p.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
|
no next file »
|
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 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 |
| 11 custom_config: | | 11 custom_config: | |
| 12 rewrite ^/android-support/faq/?$ https://adblockplus.org/forum/viewforum.p hp?f=15 permanent; | |
| 13 rewrite ^/android-support/?$ https://adblockplus.org/forum/viewforum.php?f =15 permanent; | |
| 14 rewrite ^/android-support/privacy-options/?$ https://adblockplus.org/forum /viewforum.php?f=15 permanent; | |
| 15 rewrite ^/android-support/acceptable-ads-config/?$ https://adblockplus.org /forum/viewforum.php?f=15 permanent; | |
| 16 rewrite ^/ios-support/?$ https://adblockplus.org/forum/viewforum.php?f=26 permanent; | |
| 17 rewrite ^/es-ES/?$ https://adblockbrowser.org/es/ permanent; | |
| 18 rewrite ^/android-support/install/?$ https://adblockplus.org/forum/viewfor um.php?f=15 permanent; | |
| 19 rewrite ^/ios-support/additional-filter-lists/?$ https://adblockplus.org/f orum/viewforum.php?f=26 permanent; | |
| 20 rewrite ^/android-support/customizing-abb/?$ https://adblockplus.org/forum /viewforum.php?f=15 permanent; | |
| 21 rewrite ^/android-support/adding-filter-list/?$ https://adblockplus.org/fo rum/viewforum.php?f=15 permanent; | |
| 22 rewrite ^/android-support/changing-language https://adblockplus.org/forum/ viewforum.php?f=15 permanent; | |
| 23 rewrite ^/ios-support/changing-search-engine/?$ https://adblockplus.org/fo rum/viewforum.php?f=26 permanent; | |
| 24 rewrite ^/ios-support/view-whitelisted-websites/?$ https://adblockplus.org /forum/viewforum.php?f=26 permanent; | |
| 25 rewrite ^/ios-support/adding-filter-list/?$ https://adblockplus.org/forum/ viewforum.php?f=26 permanent; | |
| 26 rewrite ^/ios-support/disable-search-suggestions/?$ https://adblockplus.or g/forum/viewforum.php?f=26 permanent; | |
| 27 rewrite ^/ios-support/acceptable-ads-config/?$ https://adblockplus.org/for um/viewforum.php?f=26 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; | |
| 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; | |
| 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; | |
| 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; | |
| 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; | |
| 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; | |
| 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; | |
| 42 rewrite ^/zh-TW/ios-support/install/?$ https://adblockplus.org/forum/viewf orum.php?f=26 permanent; | |
| 43 location ~ /forum/view(forum|topic) { | |
| 44 rewrite ^(.*)/(forum)/(view(forum|topic)) https://adblockplus.org/$2/$3.p hp permanent; | |
|
mathias
2018/05/30 21:15:40
Please improve on that regular expression. There s
| |
| 45 } | |
| 12 location /submit-feedback { | 46 location /submit-feedback { |
| 13 proxy_pass http://127.0.0.1:8000; | 47 proxy_pass http://127.0.0.1:8000; |
| 14 proxy_set_header User-Agent $http_user_agent; | 48 proxy_set_header User-Agent $http_user_agent; |
| 15 proxy_set_header Referer $http_referer; | 49 proxy_set_header Referer $http_referer; |
| 16 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | 50 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; |
| 17 proxy_set_header Accept-Language $http_accept_language; | 51 proxy_set_header Accept-Language $http_accept_language; |
| 18 proxy_set_header Host $http_host; | 52 proxy_set_header Host $http_host; |
| 19 proxy_set_header X-Client-Id $http_x_client_id; | 53 proxy_set_header X-Client-Id $http_x_client_id; |
| 20 } | 54 } |
| 21 location /badadssuck { | 55 location /badadssuck { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 44 sitescripts::configfragments: | 78 sitescripts::configfragments: |
| 45 installation_link: | 79 installation_link: |
| 46 content: | | 80 content: | |
| 47 [DEFAULT] | 81 [DEFAULT] |
| 48 mailer=/usr/sbin/sendmail | 82 mailer=/usr/sbin/sendmail |
| 49 [multiplexer] | 83 [multiplexer] |
| 50 sitescripts.send_installation_link.web.send_installation_link = | 84 sitescripts.send_installation_link.web.send_installation_link = |
| 51 [send_installation_link] | 85 [send_installation_link] |
| 52 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl | 86 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl |
| 53 | 87 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
