Unified Diff: modules/filtermaster/manifests/init.pp
Issue 29323001:
Issue 2836 - Fix regressions from #2814 / #2835 (Closed)
Patch Set:
Created July 29, 2015, 6:25 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« hiera/roles/filtermasterserver.yaml ('k')
|
modules/filtermaster/templates/sitescripts.ini.erb » ('j')
|
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/filtermaster/manifests/init.pp |
| diff --git a/modules/filtermaster/manifests/init.pp b/modules/filtermaster/manifests/init.pp |
| index 09013d927cff64b36a6f159da2eb6ad65f849e89..bbd9b7b08ed352f717f8fa73be8f786cfd6643f5 100755 |
| --- a/modules/filtermaster/manifests/init.pp |
| +++ b/modules/filtermaster/manifests/init.pp |
| @@ -1,4 +1,7 @@ |
| -class filtermaster { |
| +class filtermaster( |
| + $repos = hiera('filtermaster::repos', []), |
| + $repo_downloads = hiera('filtermaster::repo_downloads', {}), |
| +) { |
| Cron { |
| environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'], |
| @@ -98,7 +101,10 @@ class filtermaster { |
| } |
| } |
| - create_resources('filtermaster::repo_download', $repo_download) |
| + create_resources('filtermaster::repo_download', $repo_downloads) |
| + |
| + repo_download {$repos: |
| + } |
| cron {'update_subscription': |
| ensure => present, |
« no previous file with comments
|
« hiera/roles/filtermasterserver.yaml ('k')
|
modules/filtermaster/templates/sitescripts.ini.erb » ('j')
|
no next file with comments »
