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

Side by Side Diff: hiera/roles/web/adblockbrowser.yaml

Issue 29559560: #3763 - Configure adblockbrowser.org/badadssuck redirects (Closed)
Patch Set: Created Sept. 29, 2017, 9:10 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 | hiera/roles/web/redirect/eyeo.yaml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 location /submit-feedback { 12 location /submit-feedback {
13 proxy_pass http://127.0.0.1:8000; 13 proxy_pass http://127.0.0.1:8000;
14 proxy_set_header User-Agent $http_user_agent; 14 proxy_set_header User-Agent $http_user_agent;
15 proxy_set_header Referer $http_referer; 15 proxy_set_header Referer $http_referer;
16 proxy_set_header X-Forwarded-For $http_x_forwarded_for; 16 proxy_set_header X-Forwarded-For $http_x_forwarded_for;
17 proxy_set_header Accept-Language $http_accept_language; 17 proxy_set_header Accept-Language $http_accept_language;
18 proxy_set_header Host $http_host; 18 proxy_set_header Host $http_host;
19 proxy_set_header X-Client-Id $http_x_client_id; 19 proxy_set_header X-Client-Id $http_x_client_id;
20 } 20 }
21 location /badadssuck {
22 rewrite ^(.*) https://eyeo.to/$1 redirect;
23 }
21 repository: web.adblockbrowser.org 24 repository: web.adblockbrowser.org
22 multiplexer_locations: 25 multiplexer_locations:
23 - /sendInstallationLink 26 - /sendInstallationLink
24 27
25 logrotate::config: 28 logrotate::config:
26 adblockbrowser_feedback_data: 29 adblockbrowser_feedback_data:
27 content: | 30 content: |
28 /var/log/nginx/adblockbrowser_feedback { 31 /var/log/nginx/adblockbrowser_feedback {
29 daily 32 daily
30 rotate 30 33 rotate 30
(...skipping 10 matching lines...) Expand all
41 sitescripts::configfragments: 44 sitescripts::configfragments:
42 installation_link: 45 installation_link:
43 content: | 46 content: |
44 [DEFAULT] 47 [DEFAULT]
45 mailer=/usr/sbin/sendmail 48 mailer=/usr/sbin/sendmail
46 [multiplexer] 49 [multiplexer]
47 sitescripts.send_installation_link.web.send_installation_link = 50 sitescripts.send_installation_link.web.send_installation_link =
48 [send_installation_link] 51 [send_installation_link]
49 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl 52 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl
50 53
OLDNEW
« no previous file with comments | « no previous file | hiera/roles/web/redirect/eyeo.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld