Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/adblockplus/manifests/init.pp

Issue 29335885: Issue 3574 - Introduce parameter $adblockplus::authority (Closed)
Patch Set: Created Feb. 7, 2016, 6:56 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld