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

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

Issue 29438564: #301 - Provision formmail templates with absolute paths (Closed)
Patch Set: Created May 16, 2017, 12:29 a.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/web/manifests/server.pp » ('j') | modules/web/manifests/server.pp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 committee_application_template: &committee_application_template |
2 To: committee@acceptableads.org
3 From: donotreply@adblockplus.org
4 Reply-To: {{(fields.name,fields.email)|emailaddr|mime}}
5 Subject: Submission for Acceptable Ads committee by {{fields.name|mime}} from {{fields.company|mime}}
6 Content-Transfer-Encoding: 8bit
7 Content-Type: text/plain; charset="UTF-8"
8
9 {{fields.name}} would like to apply for the Acceptable Ads committee:
10
11 Name: {{fields.name}}
12 Title: {{fields.title}}
13 Company: {{fields.company}}
14 Email: {{fields.email}}
15 Phone: {{fields.phone}}
16 Group: {{fields.group}}
17
18 Motivation:
19 {{fields.motivation}}
20
21
1 classes: 22 classes:
2 statsclient: 23 statsclient:
3 web::server: 24 web::server:
4 vhost: acceptableads.com 25 vhost: acceptableads.com
5 aliases: 26 aliases:
6 - www.acceptableads.com 27 - www.acceptableads.com
7 - acceptableads.org 28 - acceptableads.org
8 - www.acceptableads.org 29 - www.acceptableads.org
9 custom_config: | 30 custom_config: |
10 rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent; 31 rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent;
11 is_default: true 32 is_default: true
12 multiplexer_locations: 33 multiplexer_locations:
13 - /committee/apply/submit 34 - /committee/apply/submit
14 repository: web.acceptableads.com 35 repository: web.acceptableads.com
36 formmail:
37 path: "/var/committee.mail"
f.nicolaisen 2017/05/16 08:41:54 See my next comment about dir.
f.lopez 2017/05/16 19:43:24 Acknowledged.
38 ensure: present
39 content: *committee_application_template
15 40
16 sitescripts::configfragments: 41 sitescripts::configfragments:
17 committee_form: 42 committee_form:
18 content: | 43 content: |
19 [DEFAULT] 44 [DEFAULT]
20 mailer=/usr/sbin/sendmail 45 mailer=/usr/sbin/sendmail
21 mailerDebug=no 46 mailerDebug=no
22 [multiplexer] 47 [multiplexer]
23 sitescripts.formmail.web.formmail2 = 48 sitescripts.formmail.web.formmail2 =
24 [formmail2] 49 [formmail2]
25 committee.url = /committee/apply/submit 50 committee.url = /committee/apply/submit
26 committee.template = formmail/template/committee.mail 51 committee.template = /var/committee.mail
f.nicolaisen 2017/05/16 08:41:54 I would not understand what this file is for when
f.lopez 2017/05/16 19:43:24 To be fair, a managed system is not supposed to be
27 committee.fields.name = mandatory 52 committee.fields.name = mandatory
28 committee.fields.title = mandatory 53 committee.fields.title = mandatory
29 committee.fields.title.mandatory = No job title entered 54 committee.fields.title.mandatory = No job title entered
30 committee.fields.company = mandatory 55 committee.fields.company = mandatory
31 committee.fields.company.mandatory = No company name entered 56 committee.fields.company.mandatory = No company name entered
32 committee.fields.email = mandatory, email 57 committee.fields.email = mandatory, email
33 committee.fields.email.email = Invalid email address 58 committee.fields.email.email = Invalid email address
34 committee.fields.phone = 59 committee.fields.phone =
35 committee.fields.group = mandatory 60 committee.fields.group = mandatory
36 committee.fields.group.mandatory = No group selected 61 committee.fields.group.mandatory = No group selected
37 committee.fields.motivation = 62 committee.fields.motivation =
38 63
OLDNEW
« no previous file with comments | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/manifests/server.pp » ('J')

Powered by Google App Engine
This is Rietveld