summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorng <ng+gitlab@immerda.ch>2015-11-28 16:56:48 +0000
committerng <ng+gitlab@immerda.ch>2015-11-28 16:56:48 +0000
commit1cfb479d642bc106ea71596a49b3c152dcb2f64f (patch)
treef0084e0fcd35ce090dd0729b4e321170d427aa37 /manifests
parent40d8f49f21a2580db1c0f87dd93c76ede2c4a272 (diff)
parent216af53871b3c422652fdccc9cae145914044feb (diff)
Merge branch 'master' into 'master'
Remove 'require augeas' (#4396) Because the puppet 'require' keyword actually instantiates a class, having 'require augeas' in base.pp means that you cannot instantiate the augeas class anywhere else in your manifests, for example with some optional parameters to the class. If you do, you will get a duplicate definition error. The README already says that the augeas module is required. It seems better that this is managed outside of the module, allowing for class parameter flexibility. See merge request !3
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 4ee8747..7959f01 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -27,7 +27,7 @@ class shorewall::base {
}
} else {
- require augeas
+ Class['augeas'] -> Class['shorewall::base']
augeas { 'shorewall_module_config_path':
changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',