| 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 |
| 10 custom_config: | |
| 11 location /submit-feedback { |
| 12 proxy_pass http://127.0.0.1:8000; |
| 13 } |
| 6 is_default: true | 14 is_default: true |
| 7 custom_config: | | |
| 8 location = /submit-feedback/ { | |
| 9 access_log /var/log/nginx/adblockbrowser_feedback data; | |
| 10 echo_read_request_body; | |
| 11 } | |
| 12 repository: web.adblockbrowser.org | 15 repository: web.adblockbrowser.org |
| 13 multiplexer_locations: | 16 multiplexer_locations: |
| 14 - /sendInstallationLink | 17 - /sendInstallationLink |
| 15 | 18 |
| 16 logrotate::config: | 19 logrotate::config: |
| 20 mimeo_data: |
| 21 content: | |
| 22 /var/adblockplus/mimeo/data { |
| 23 weekly |
| 24 rotate 30 |
| 25 compress |
| 26 missingok |
| 27 nodateext |
| 28 } |
| 29 ensure: 'present' |
| 17 adblockbrowser_feedback_data: | 30 adblockbrowser_feedback_data: |
| 18 content: | | 31 content: | |
| 19 /var/log/nginx/adblockbrowser_feedback { | 32 /var/log/nginx/adblockbrowser_feedback { |
| 20 daily | 33 daily |
| 21 rotate 30 | 34 rotate 30 |
| 22 compress | 35 compress |
| 23 missingok | 36 missingok |
| 24 nodateext | 37 nodateext |
| 25 sharedscripts | 38 sharedscripts |
| 26 postrotate | 39 postrotate |
| 27 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` | 40 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` |
| 28 endscript | 41 endscript |
| 29 } | 42 } |
| 30 ensure: 'present' | 43 ensure: 'present' |
| 31 | 44 |
| 32 sitescripts::configfragments: | 45 sitescripts::configfragments: |
| 33 installation_link: | 46 installation_link: |
| 34 content: | | 47 content: | |
| 35 [DEFAULT] | 48 [DEFAULT] |
| 36 mailer=/usr/sbin/sendmail | 49 mailer=/usr/sbin/sendmail |
| 37 [multiplexer] | 50 [multiplexer] |
| 38 sitescripts.send_installation_link.web.send_installation_link = | 51 sitescripts.send_installation_link.web.send_installation_link = |
| 39 [send_installation_link] | 52 [send_installation_link] |
| 40 email_template=send_installation_link/template/adblockbrowser_installation
_link.tmpl | 53 email_template=send_installation_link/template/adblockbrowser_installation
_link.tmpl |
| 41 | 54 |
| OLD | NEW |