| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 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_scheme "$http_accept_ language" "$http_host" "$http_x_client_id" $http_content_length "$http_content_t ype" $http_request_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 Scheme $scheme; | |
|
mathias
2017/08/23 16:54:42
That's neither necessary nor a valid header.
f.lopez
2017/08/24 18:16:59
Done.
| |
| 18 proxy_set_header Accept-Language $http_accept_language; | |
| 19 proxy_set_header Host $http_host; | |
| 20 proxy_set_header X-Client-Id $http_x_client_id; | |
| 21 proxy_set_header Request-Body $request_body; | |
|
mathias
2017/08/23 16:54:42
That's neither thought through nor a valid header.
f.lopez
2017/08/24 18:16:59
Done.
| |
| 11 } | 22 } |
| 12 repository: web.adblockbrowser.org | 23 repository: web.adblockbrowser.org |
| 13 multiplexer_locations: | 24 multiplexer_locations: |
| 14 - /sendInstallationLink | 25 - /sendInstallationLink |
| 15 | 26 |
| 16 logrotate::config: | 27 logrotate::config: |
| 28 mimeo_data: | |
| 29 content: | | |
| 30 /var/adblockplus/mimeo/data { | |
| 31 weekly | |
| 32 rotate 30 | |
| 33 compress | |
| 34 missingok | |
| 35 nodateext | |
| 36 } | |
| 37 ensure: 'present' | |
| 17 adblockbrowser_feedback_data: | 38 adblockbrowser_feedback_data: |
| 18 content: | | 39 content: | |
| 19 /var/log/nginx/adblockbrowser_feedback { | 40 /var/log/nginx/adblockbrowser_feedback { |
| 20 daily | 41 daily |
| 21 rotate 30 | 42 rotate 30 |
| 22 compress | 43 compress |
| 23 missingok | 44 missingok |
| 24 nodateext | 45 nodateext |
| 25 sharedscripts | 46 sharedscripts |
| 26 postrotate | 47 postrotate |
| 27 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` | 48 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` |
| 28 endscript | 49 endscript |
| 29 } | 50 } |
| 30 ensure: 'present' | 51 ensure: 'present' |
| 31 | 52 |
| 32 sitescripts::configfragments: | 53 sitescripts::configfragments: |
| 33 installation_link: | 54 installation_link: |
| 34 content: | | 55 content: | |
| 35 [DEFAULT] | 56 [DEFAULT] |
| 36 mailer=/usr/sbin/sendmail | 57 mailer=/usr/sbin/sendmail |
| 37 [multiplexer] | 58 [multiplexer] |
| 38 sitescripts.send_installation_link.web.send_installation_link = | 59 sitescripts.send_installation_link.web.send_installation_link = |
| 39 [send_installation_link] | 60 [send_installation_link] |
| 40 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl | 61 email_template=send_installation_link/template/adblockbrowser_installation _link.tmpl |
| 41 | 62 |
| OLD | NEW |