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: New approach based on previous comments Created March 7, 2018, 3:57 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/sitescripts/manifests/formmail.pp » ('j') | modules/sitescripts/manifests/formmail.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
@@ -11,6 +11,31 @@
multiplexer_locations:
- /committee/apply/submit
repository: web.acceptableads.com
+ sitescripts::formmail:
+
+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}}
+
+sitescripts::formmail::templates:
+ committee.mail:
+ content: *committee_application_template
sitescripts::configfragments:
committee_form:
@@ -22,7 +47,8 @@
sitescripts.formmail.web.formmail2 =
[formmail2]
committee.url = /committee/apply/submit
- committee.template = formmail/template/committee.mail
+ committee.csv_log = /var/log/committee_email.csv_log
f.lopez 2018/03/07 17:26:46 BTW, this is related to http://hub.eyeo.com/issues
+ committee.template = /var/sitescripts/formmail/committee.mail
committee.fields.name = mandatory
committee.fields.title = mandatory
committee.fields.title.mandatory = No job title entered
@@ -35,3 +61,14 @@
committee.fields.group.mandatory = No group selected
committee.fields.motivation =
+logrotate::config:
+ committee_email_data:
+ content: |
+ /var/log/committee_email {
+ weekly
+ rotate 30
+ compress
+ missingok
+ nodateext
+ }
+ ensure: 'present'
« no previous file with comments | « no previous file | modules/sitescripts/manifests/formmail.pp » ('j') | modules/sitescripts/manifests/formmail.pp » ('J')

Powered by Google App Engine
This is Rietveld