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

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

Issue 29329307: Issue 3211 - Integrate customservice::supervisor with notification daemon (Closed)
Patch Set: Issue 3211 - Address feedback from codereview Created Oct. 26, 2015, 12:14 p.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 | « modules/notificationserver/manifests/init.pp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/sitescripts/manifests/init.pp
diff --git a/modules/sitescripts/manifests/init.pp b/modules/sitescripts/manifests/init.pp
index 18795394d6825b442d84f654c47747060601f670..246290193112290af86d2e1a0eba1f8bdff3b0d3 100644
--- a/modules/sitescripts/manifests/init.pp
+++ b/modules/sitescripts/manifests/init.pp
@@ -3,14 +3,16 @@ class sitescripts (
$sitescriptsini_content = '',
){
- concat {'/etc/sitescripts.ini':
+ @concat {'/etc/sitescripts.ini':
mode => 644,
owner => root,
group => root,
}
- define configfragment($content = '', $source = '')
- {
+ define configfragment($content = '', $source = '') {
+
+ realize(Concat['/etc/sitescripts.ini'])
+
concat::fragment {"/etc/sitescripts.ini#$title":
target => '/etc/sitescripts.ini',
content => $content,
@@ -21,9 +23,12 @@ class sitescripts (
}
}
- configfragment {'/etc/sitescripts.ini':
- content => $sitescriptsini_content,
- source => $sitescriptsini_source,
+ if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') {
+
+ configfragment {'/etc/sitescripts.ini':
+ content => $sitescriptsini_content,
+ source => $sitescriptsini_source,
+ }
}
$configfragments = hiera('sitescripts::configfragments', {})
« no previous file with comments | « modules/notificationserver/manifests/init.pp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld