modules/sitescripts/manifests/init.pp - Issue 29438564: #301 - Provision formmail templates with absolute paths

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: modules/sitescripts/manifests/init.pp

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.

Left:
Right:

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

Jump to:

OLD	NEW
1 class sitescripts (	1 class sitescripts (

	2 $directory = {},

2 $sitescriptsini_source = '',	3 $sitescriptsini_source = '',

3 $sitescriptsini_content = '',	4 $sitescriptsini_content = '',

4 ){	5 ){

5	6

6 ensure_resource('adblockplus::sitescripts::repository', 'sitescripts')	7 ensure_resource('adblockplus::sitescripts::repository', 'sitescripts')

7	8

	9 ensure_resource('file', $title, merge({

	10 'ensure' => 'directory',

	11 'path' => '/var/sitescripts',

	12 }, $directory))

	13

	14 $directory_path = getparam(File[$title], 'path')

	15

8 @concat {'/etc/sitescripts.ini':	16 @concat {'/etc/sitescripts.ini':

9 mode => '644',	17 mode => '644',

10 owner => root,	18 owner => root,

11 group => root,	19 group => root,

12 }	20 }

13	21

14 define configfragment($content = '', $source = '') {	22 define configfragment($content = '', $source = '') {

15	23

16 realize(Concat['/etc/sitescripts.ini'])	24 realize(Concat['/etc/sitescripts.ini'])

17	25

(...skipping 19 matching lines...) Expand all Loading...
37 }	45 }

38	46

39 configfragment {'/etc/sitescripts.ini':	47 configfragment {'/etc/sitescripts.ini':

40 content => $content,	48 content => $content,

41 source => $source,	49 source => $source,

42 }	50 }

43	51

44 $configfragments = hiera('sitescripts::configfragments', {})	52 $configfragments = hiera('sitescripts::configfragments', {})

45 create_resources('sitescripts::configfragment', $configfragments)	53 create_resources('sitescripts::configfragment', $configfragments)

46 }	54 }

OLD	NEW