Unified Diff: modules/adblockplus/manifests/init.pp
Issue 29339094:
Issue 3574 - Introduce parameter $adblockplus::packages (Closed)
Patch Set:
Created March 29, 2016, 10:28 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/base/manifests/init.pp » ('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/adblockplus/manifests/init.pp |
| diff --git a/modules/adblockplus/manifests/init.pp b/modules/adblockplus/manifests/init.pp |
| index 2f1dfdc8fb0f8e9ece0b5cb3c7f823c262bd25d6..216ad69816c33cee68ebd40ee9a0c5d5dc517898 100644 |
| --- a/modules/adblockplus/manifests/init.pp |
| +++ b/modules/adblockplus/manifests/init.pp |
| @@ -36,6 +36,7 @@ |
| class adblockplus ( |
| $authority = hiera('adblockplus::authority', 'adblockplus.org'), |
| $hosts = hiera_hash('adblockplus::hosts', {}), |
| + $packages = hiera_array('adblockplus::packages', []), |
| $users = hiera_hash('adblockplus::users', {}), |
| ) { |
| @@ -100,6 +101,9 @@ class adblockplus ( |
| # Fix implicit package dependency Class['apt'] does not properly handle |
| Exec['apt_update'] -> Package<|title != 'python-software-properties'|> |
| + # https://issues.adblockplus.org/ticket/3574#comment:18 |
| + ensure_packages($packages) |
| + |
| # https://projects.puppetlabs.com/issues/4145 |
| ensure_resource('file', '/etc/ssh/ssh_known_hosts', { |
| ensure => 'present', |
« no previous file with comments
|
« no previous file
|
modules/base/manifests/init.pp » ('j')
|
no next file with comments »
