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

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

Issue 29525555: #622 - Use mimeo module on abb website (Closed)
Patch Set: For comment 5 Created Aug. 24, 2017, 6:39 p.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 | modules/adblockplus/files/mimeo.py » ('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:
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!
5 port: 8000
2 web::server: 6 web::server:
3 vhost: adblockbrowser.org 7 vhost: adblockbrowser.org
4 aliases: 8 aliases:
5 - www.adblockbrowser.org 9 - www.adblockbrowser.org
6 is_default: true 10 is_default: true
7 custom_config: | 11 custom_config: |
8 location = /submit-feedback/ { 12 location /submit-feedback {
9 access_log /var/log/nginx/adblockbrowser_feedback data; 13 proxy_pass http://127.0.0.1:8000;
10 echo_read_request_body; 14 proxy_set_header User-Agent $http_user_agent;
15 proxy_set_header Referer $http_referer;
16 proxy_set_header X-Forwarded-For $http_x_forwarded_for;
17 proxy_set_header Accept-Language $http_accept_language;
18 proxy_set_header Host $http_host;
19 proxy_set_header X-Client-Id $http_x_client_id;
11 } 20 }
12 repository: web.adblockbrowser.org 21 repository: web.adblockbrowser.org
13 multiplexer_locations: 22 multiplexer_locations:
14 - /sendInstallationLink 23 - /sendInstallationLink
15 24
16 logrotate::config: 25 logrotate::config:
26 mimeo_data:
mathias 2017/08/24 18:43:43 I think this one should be configured in the mimeo
f.lopez 2017/08/24 18:46:56 I'll do it here, wait for it.
27 content: |
28 /var/adblockplus/mimeo/data {
29 weekly
30 rotate 30
31 compress
32 missingok
33 nodateext
34 }
35 ensure: 'present'
17 adblockbrowser_feedback_data: 36 adblockbrowser_feedback_data:
18 content: | 37 content: |
19 /var/log/nginx/adblockbrowser_feedback { 38 /var/log/nginx/adblockbrowser_feedback {
20 daily 39 daily
21 rotate 30 40 rotate 30
22 compress 41 compress
23 missingok 42 missingok
24 nodateext 43 nodateext
25 sharedscripts 44 sharedscripts
26 postrotate 45 postrotate
27 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` 46 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
28 endscript 47 endscript
29 } 48 }
30 ensure: 'present' 49 ensure: 'present'
31 50
32 sitescripts::configfragments: 51 sitescripts::configfragments:
33 installation_link: 52 installation_link:
34 content: | 53 content: |
35 [DEFAULT] 54 [DEFAULT]
36 mailer=/usr/sbin/sendmail 55 mailer=/usr/sbin/sendmail
37 [multiplexer] 56 [multiplexer]
38 sitescripts.send_installation_link.web.send_installation_link = 57 sitescripts.send_installation_link.web.send_installation_link =
39 [send_installation_link] 58 [send_installation_link]
40 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl 59 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl
41 60
OLDNEW
« no previous file with comments | « no previous file | modules/adblockplus/files/mimeo.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld