modules/filtermaster/manifests/init.pp - Issue 29329128: Issue 123 - Integrate filtermaster cron::envrionment with Hiera

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

Unified Diff: modules/filtermaster/manifests/init.pp

Issue 29329128: Issue 123 - Integrate filtermaster cron::envrionment with Hiera (Closed)

Patch Set: Created Oct. 14, 2015, 5:16 p.m.

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

Jump to:

Index: modules/filtermaster/manifests/init.pp

diff --git a/modules/filtermaster/manifests/init.pp b/modules/filtermaster/manifests/init.pp

index 17bb8dd04f36e0b787c55be43c38714b53c70da1..0d5aac9c327b8cd8ad8606709c82a9ccd90e037d 100755

--- a/modules/filtermaster/manifests/init.pp

+++ b/modules/filtermaster/manifests/init.pp

@@ -4,7 +4,9 @@ class filtermaster(

) {

Cron {

- environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'],

+ environment => concat(hiera('cron::environment', []), [

+ 'PYTHONPATH=/opt/sitescripts',

+ ]),

}

include ssh

« no previous file with comments | « no previous file | no next file » | no next file with comments »