Unified Diff: modules/sitescripts/manifests/init.pp
Issue 5814178002501632:
Issue 1495 - Introduce $sitescriptsini_content parameter (Closed)
Patch Set: Issue 1405 - Introduce $sitescriptsini_content in Puppet sitescripts module
Created Dec. 10, 2014, 12:48 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/sitescripts/manifests/init.pp |
| diff --git a/modules/sitescripts/manifests/init.pp b/modules/sitescripts/manifests/init.pp |
| index 60510de37c4dbd72281a7ffd21fa4b106e36bb07..b8d529e568c767072226346defe7f78010b3b8c3 100644 |
| --- 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 @@ class sitescripts ( |
| 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, |
| + 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", |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
