| Index: modules/adblockplus/manifests/init.pp |
| diff --git a/modules/adblockplus/manifests/init.pp b/modules/adblockplus/manifests/init.pp |
| index 300c20c3c59e4aeca228f5fe672085c0ae88798f..05b4f656bf942811b7130fcbf79ba9150e2c1731 100644 |
| --- a/modules/adblockplus/manifests/init.pp |
| +++ b/modules/adblockplus/manifests/init.pp |
| @@ -10,6 +10,10 @@ |
| # The authorative domain or zone associated with the current environment, |
| # similar to the deprecated and soon to be removed $base::zone. |
| # |
| +# [*hosts*] |
| +# A hash of adblockplus::host $name => $parameter items to set up in this |
| +# context, i.e. via Hiera. |
| +# |
| # [*users*] |
| # A hash of adblockplus::user $name => $parameter items to set up in this |
| # context, i.e. via Hiera. |
| @@ -17,6 +21,11 @@ |
| # === Examples: |
| # |
| # class {'adblockplus': |
| +# hosts => { |
| +# 'node1' => { |
| +# # see adblockplus::host |
| +# }, |
| +# }, |
| # users => { |
| # 'pinocchio' => { |
| # # see adblockplus::user |
| @@ -26,6 +35,7 @@ |
| # |
| class adblockplus ( |
| $authority = hiera('adblockplus::authority', 'adblockplus.org'), |
| + $hosts = hiera_hash('adblockplus::hosts', {}), |
| $users = hiera_hash('adblockplus::users', {}), |
| ) { |
| @@ -75,6 +85,15 @@ class adblockplus ( |
| } |
| } |
| + # https://projects.puppetlabs.com/issues/4145 |
| + ensure_resource('file', '/etc/ssh/ssh_known_hosts', { |
| + ensure => 'present', |
| + mode => 0644, |
| + }) |
| + |
| + # See modules/adblockplus/manifests/host.pp |
| + create_resources('adblockplus::host', $hosts) |
| + |
| # See modules/adblockplus/manifests/user.pp |
| create_resources('adblockplus::user', $users) |
| } |