Index: modules/sitescripts/manifests/init.pp |
=================================================================== |
--- a/modules/sitescripts/manifests/init.pp |
+++ b/modules/sitescripts/manifests/init.pp |
@@ -1,5 +1,6 @@ |
class sitescripts ( |
- $sitescriptsini_source = undef |
+ $sitescriptsini_source = '', |
+ $sitescriptsini_content = '', |
){ |
concat {'/etc/sitescripts.ini': |
@@ -8,15 +9,22 @@ |
group => root, |
} |
- define configfragment($source = $title) |
+ define configfragment($content = '', $source = '') |
{ |
- concat::fragment {$source: |
- target => '/etc/sitescripts.ini', |
- source => $source |
+ concat::fragment {"/etc/sitescripts.ini#$title": |
+ target => '/etc/sitescripts.ini', |
+ content => $content, |
+ source => "$source;$content" ? { |
+ ';' => $title, |
Wladimir Palant
2014/11/26 22:47:09
Why not:
source => "$source$content" ? {
''
mathias
2014/11/26 23:34:29
I would agree on "more common" rather than "more o
Wladimir Palant
2014/12/08 16:44:00
I do :)
In fact, I asked Sebastian as somebody wh
mathias
2014/12/10 12:51:05
Done.
|
+ default => $source, |
+ } |
} |
} |
- configfragment {$sitescriptsini_source: } |
+ configfragment {'/etc/sitescripts.ini': |
+ content => $sitescriptsini_content, |
+ source => $sitescriptsini_source, |
+ } |
exec { "fetch_sitescripts": |
command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts", |