hiera/roles/web/acceptableads.yaml - Issue 29438564: #301 - Provision formmail templates with absolute paths

Delta Between Two Patch Sets: hiera/roles/web/acceptableads.yaml

Issue 29438564: #301 - Provision formmail templates with absolute paths (Closed)

Left Patch Set: Created May 16, 2017, 12:29 a.m.

Right Patch Set: For comments 7 and 8 Created March 7, 2018, 11:08 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
	1 classes:

	2 web::server:

	3 vhost: acceptableads.com

	4 aliases:

	5 - www.acceptableads.com

	6 - acceptableads.org

	7 - www.acceptableads.org

	8 custom_config: \|

	9 rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent;

	10 is_default: true

	11 multiplexer_locations:

	12 - /committee/apply/submit

	13 repository: web.acceptableads.com

	14 sitescripts::formmail:

	15

1 committee_application_template: &committee_application_template \|	16 committee_application_template: &committee_application_template \|

2 To: committee@acceptableads.org	17 To: committee@acceptableads.org

3 From: donotreply@adblockplus.org	18 From: donotreply@adblockplus.org

4 Reply-To: {{(fields.name,fields.email)\|emailaddr\|mime}}	19 Reply-To: {{(fields.name,fields.email)\|emailaddr\|mime}}

5 Subject: Submission for Acceptable Ads committee by {{fields.name\|mime}} from {{fields.company\|mime}}	20 Subject: Submission for Acceptable Ads committee by {{fields.name\|mime}} from {{fields.company\|mime}}

6 Content-Transfer-Encoding: 8bit	21 Content-Transfer-Encoding: 8bit

7 Content-Type: text/plain; charset="UTF-8"	22 Content-Type: text/plain; charset="UTF-8"

8	23

9 {{fields.name}} would like to apply for the Acceptable Ads committee:	24 {{fields.name}} would like to apply for the Acceptable Ads committee:

10	25

11 Name: {{fields.name}}	26 Name: {{fields.name}}

12 Title: {{fields.title}}	27 Title: {{fields.title}}

13 Company: {{fields.company}}	28 Company: {{fields.company}}

14 Email: {{fields.email}}	29 Email: {{fields.email}}

15 Phone: {{fields.phone}}	30 Phone: {{fields.phone}}

16 Group: {{fields.group}}	31 Group: {{fields.group}}

17	32

18 Motivation:	33 Motivation:

19 {{fields.motivation}}	34 {{fields.motivation}}

20	35

21	36 sitescripts::formmail::templates:

22 classes:	37 committee.mail:

23 statsclient:	38 content: *committee_application_template

24 web::server:

25 vhost: acceptableads.com

26 aliases:

27 - www.acceptableads.com

28 - acceptableads.org

29 - www.acceptableads.org

30 custom_config: \|

31 rewrite ^(/..)?/[Pp]latform$ $1/tool-certification permanent;

32 is_default: true

33 multiplexer_locations:

34 - /committee/apply/submit

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. See my next comment about dir. f.lopez 2017/05/16 19:43:24 Acknowledged. Show quoted text On 2017/05/16 08:41:54, f.nicolaisen wrote: > See my next comment about dir. Acknowledged.
38 ensure: present

39 content: *committee_application_template

40	39

41 sitescripts::configfragments:	40 sitescripts::configfragments:

42 committee_form:	41 committee_form:

43 content: \|	42 content: \|

44 [DEFAULT]	43 [DEFAULT]

45 mailer=/usr/sbin/sendmail	44 mailer=/usr/sbin/sendmail

46 mailerDebug=no	45 mailerDebug=no

47 [multiplexer]	46 [multiplexer]

48 sitescripts.formmail.web.formmail2 =	47 sitescripts.formmail.web.formmail2 =

49 [formmail2]	48 [formmail2]

50 committee.url = /committee/apply/submit	49 committee.url = /committee/apply/submit

51 committee.template = /var/committee.mail	50 committee.csv_log = /var/log/committee_email.csv_log
f.nicolaisen 2017/05/16 08:41:54 I would not understand what this file is for when I would not understand what this file is for when browsing the filesystem. I would find it clearer if there's a directory for sitescripts/formmail configuration with the committee.mail file inside. f.lopez 2017/05/16 19:43:24 To be fair, a managed system is not supposed to be Show quoted text On 2017/05/16 08:41:54, f.nicolaisen wrote: > I would not understand what this file is for when browsing the filesystem. To be fair, a managed system is not supposed to be browsed manually. Show quoted text > I would find it clearer if there's a directory for sitescripts/formmail > configuration with the committee.mail file inside. I can agree with this at some extent, I did this because with puppet is kinda hard to create a full path in case it doesn't exist, and since the configuration is in hiera, you don't have to understand the parts from the filesystem but from hiera itself.
	51 committee.template = /var/sitescripts/formmail/committee.mail

52 committee.fields.name = mandatory	52 committee.fields.name = mandatory

53 committee.fields.title = mandatory	53 committee.fields.title = mandatory

54 committee.fields.title.mandatory = No job title entered	54 committee.fields.title.mandatory = No job title entered

55 committee.fields.company = mandatory	55 committee.fields.company = mandatory

56 committee.fields.company.mandatory = No company name entered	56 committee.fields.company.mandatory = No company name entered

57 committee.fields.email = mandatory, email	57 committee.fields.email = mandatory, email

58 committee.fields.email.email = Invalid email address	58 committee.fields.email.email = Invalid email address

59 committee.fields.phone =	59 committee.fields.phone =

60 committee.fields.group = mandatory	60 committee.fields.group = mandatory

61 committee.fields.group.mandatory = No group selected	61 committee.fields.group.mandatory = No group selected

62 committee.fields.motivation =	62 committee.fields.motivation =

63	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'

LEFT	RIGHT