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

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

Issue 29525555: #622 - Use mimeo module on abb website (Closed)
Left Patch Set: For comment 5 Created Aug. 24, 2017, 6:39 p.m.
Right Patch Set: For comment 10 Created Aug. 24, 2017, 8:01 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 | modules/adblockplus/files/mimeo.py » ('j') | 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
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 repository: web.adblockbrowser.org 21 repository: web.adblockbrowser.org
22 multiplexer_locations: 22 multiplexer_locations:
23 - /sendInstallationLink 23 - /sendInstallationLink
24 24
25 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'
36 adblockbrowser_feedback_data: 26 adblockbrowser_feedback_data:
37 content: | 27 content: |
38 /var/log/nginx/adblockbrowser_feedback { 28 /var/log/nginx/adblockbrowser_feedback {
39 daily 29 daily
40 rotate 30 30 rotate 30
41 compress 31 compress
42 missingok 32 missingok
43 nodateext 33 nodateext
44 sharedscripts 34 sharedscripts
45 postrotate 35 postrotate
46 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` 36 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
47 endscript 37 endscript
48 } 38 }
49 ensure: 'present' 39 ensure: 'present'
50 40
51 sitescripts::configfragments: 41 sitescripts::configfragments:
52 installation_link: 42 installation_link:
53 content: | 43 content: |
54 [DEFAULT] 44 [DEFAULT]
55 mailer=/usr/sbin/sendmail 45 mailer=/usr/sbin/sendmail
56 [multiplexer] 46 [multiplexer]
57 sitescripts.send_installation_link.web.send_installation_link = 47 sitescripts.send_installation_link.web.send_installation_link =
58 [send_installation_link] 48 [send_installation_link]
59 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl 49 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl
60 50
LEFTRIGHT

Powered by Google App Engine
This is Rietveld