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

Unified 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.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/manifests/server.pp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: hiera/roles/web/acceptableads.yaml
===================================================================
--- a/hiera/roles/web/acceptableads.yaml
+++ b/hiera/roles/web/acceptableads.yaml
@@ -1,3 +1,24 @@
+committee_application_template: &committee_application_template |
+ To: committee@acceptableads.org
+ From: donotreply@adblockplus.org
+ Reply-To: {{(fields.name,fields.email)|emailaddr|mime}}
+ Subject: Submission for Acceptable Ads committee by {{fields.name|mime}} from {{fields.company|mime}}
+ Content-Transfer-Encoding: 8bit
+ Content-Type: text/plain; charset="UTF-8"
+
+ {{fields.name}} would like to apply for the Acceptable Ads committee:
+
+ Name: {{fields.name}}
+ Title: {{fields.title}}
+ Company: {{fields.company}}
+ Email: {{fields.email}}
+ Phone: {{fields.phone}}
+ Group: {{fields.group}}
+
+ Motivation:
+ {{fields.motivation}}
+
+
classes:
statsclient:
web::server:
@@ -12,6 +33,10 @@
multiplexer_locations:
- /committee/apply/submit
repository: web.acceptableads.com
+ formmail:
+ 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.
+ ensure: present
+ content: *committee_application_template
sitescripts::configfragments:
committee_form:
@@ -23,7 +48,7 @@
sitescripts.formmail.web.formmail2 =
[formmail2]
committee.url = /committee/apply/submit
- committee.template = formmail/template/committee.mail
+ 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
committee.fields.name = mandatory
committee.fields.title = mandatory
committee.fields.title.mandatory = No job title entered
« 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