| Index: modules/adblockplus/manifests/init.pp |
| diff --git a/modules/adblockplus/manifests/init.pp b/modules/adblockplus/manifests/init.pp |
| index a5215e7a7da7c1b0fb004da10f9f63e62eb5e580..c887d6471b20d1249917a0961cc0a673e2e9e52e 100644 |
| --- a/modules/adblockplus/manifests/init.pp |
| +++ b/modules/adblockplus/manifests/init.pp |
| @@ -6,6 +6,10 @@ |
| # |
| # === Parameters: |
| # |
| +# [*authority*] |
| +# The authorative domain or zone associated with the current environment, |
| +# similar to the deprecated and soon to be removed $base::zone. |
| +# |
| # [*users*] |
| # A hash of adblockplus::user $name => $parameter items to set up in this |
| # context, i.e. via Hiera. |
| @@ -21,11 +25,14 @@ |
| # } |
| # |
| class adblockplus ( |
| + $authority = hiera('adblockplus::authority', 'adblockplus.org'), |
| $users = hiera_hash('adblockplus::users', {}), |
| ) { |
| - # See https://issues.adblockplus.org/ticket/3574#comment:4 |
| - include base |
| + # See https://issues.adblockplus.org/ticket/3574#comment:8 |
| + class {'base': |
| + zone => $authority, |
| + } |
| # Used as internal constant within adblockplus::* resources |
| $directory = '/var/adblockplus' |