| OLD | NEW | 
|---|
| 1 classes: | 1 classes: | 
| 2   web::server: | 2   web::server: | 
| 3     vhost: acceptableads.com | 3     vhost: acceptableads.com | 
| 4     aliases: | 4     aliases: | 
| 5       - www.acceptableads.com | 5       - www.acceptableads.com | 
| 6       - acceptableads.org | 6       - acceptableads.org | 
| 7       - www.acceptableads.org | 7       - www.acceptableads.org | 
| 8     custom_config: | | 8     custom_config: | | 
| 9       rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent; | 9       rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent; | 
| 10     is_default: true | 10     is_default: true | 
| 11     multiplexer_locations: | 11     multiplexer_locations: | 
| 12       - /committee/apply/submit | 12       - /committee/apply/submit | 
| 13     repository: web.acceptableads.com | 13     repository: web.acceptableads.com | 
|  | 14   sitescripts::formmail: | 
|  | 15 | 
|  | 16 committee_application_template: &committee_application_template | | 
|  | 17   To: committee@acceptableads.org | 
|  | 18   From: donotreply@adblockplus.org | 
|  | 19   Reply-To: {{(fields.name,fields.email)|emailaddr|mime}} | 
|  | 20   Subject: Submission for Acceptable Ads committee by {{fields.name|mime}} from 
    {{fields.company|mime}} | 
|  | 21   Content-Transfer-Encoding: 8bit | 
|  | 22   Content-Type: text/plain; charset="UTF-8" | 
|  | 23 | 
|  | 24   {{fields.name}} would like to apply for the Acceptable Ads committee: | 
|  | 25 | 
|  | 26   Name: {{fields.name}} | 
|  | 27   Title: {{fields.title}} | 
|  | 28   Company: {{fields.company}} | 
|  | 29   Email: {{fields.email}} | 
|  | 30   Phone: {{fields.phone}} | 
|  | 31   Group: {{fields.group}} | 
|  | 32 | 
|  | 33   Motivation: | 
|  | 34   {{fields.motivation}} | 
|  | 35 | 
|  | 36 sitescripts::formmail::templates: | 
|  | 37   committee.mail: | 
|  | 38     content: *committee_application_template | 
| 14 | 39 | 
| 15 sitescripts::configfragments: | 40 sitescripts::configfragments: | 
| 16   committee_form: | 41   committee_form: | 
| 17     content: | | 42     content: | | 
| 18       [DEFAULT] | 43       [DEFAULT] | 
| 19       mailer=/usr/sbin/sendmail | 44       mailer=/usr/sbin/sendmail | 
| 20       mailerDebug=no | 45       mailerDebug=no | 
| 21       [multiplexer] | 46       [multiplexer] | 
| 22       sitescripts.formmail.web.formmail2 = | 47       sitescripts.formmail.web.formmail2 = | 
| 23       [formmail2] | 48       [formmail2] | 
| 24       committee.url = /committee/apply/submit | 49       committee.url = /committee/apply/submit | 
| 25       committee.template = formmail/template/committee.mail | 50       committee.csv_log = /var/log/committee_email.csv_log | 
|  | 51       committee.template = /var/sitescripts/formmail/committee.mail | 
| 26       committee.fields.name = mandatory | 52       committee.fields.name = mandatory | 
| 27       committee.fields.title = mandatory | 53       committee.fields.title = mandatory | 
| 28       committee.fields.title.mandatory = No job title entered | 54       committee.fields.title.mandatory = No job title entered | 
| 29       committee.fields.company = mandatory | 55       committee.fields.company = mandatory | 
| 30       committee.fields.company.mandatory = No company name entered | 56       committee.fields.company.mandatory = No company name entered | 
| 31       committee.fields.email = mandatory, email | 57       committee.fields.email = mandatory, email | 
| 32       committee.fields.email.email = Invalid email address | 58       committee.fields.email.email = Invalid email address | 
| 33       committee.fields.phone = | 59       committee.fields.phone = | 
| 34       committee.fields.group = mandatory | 60       committee.fields.group = mandatory | 
| 35       committee.fields.group.mandatory = No group selected | 61       committee.fields.group.mandatory = No group selected | 
| 36       committee.fields.motivation = | 62       committee.fields.motivation = | 
| 37 | 63 | 
|  | 64 logrotate::config: | 
|  | 65   committee_email_data: | 
|  | 66     content: | | 
|  | 67       /var/log/committee_email { | 
|  | 68         weekly | 
|  | 69         rotate 30 | 
|  | 70         compress | 
|  | 71         missingok | 
|  | 72         nodateext | 
|  | 73       } | 
|  | 74     ensure: 'present' | 
| OLD | NEW | 
|---|