summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-14 17:41:04 -0400
committerMicah Anderson <micah@riseup.net>2013-06-14 17:41:04 -0400
commit940e4d658443f31194f1565f6871ecab012b85a0 (patch)
tree6d2a6a8df320026a1ad98b2b66ecb4d0adfeef07
parent06c5058752f7c1856380766784f48e077c3194ed (diff)
Change the 'require augeas' to instead be a class ordering hint.
When the 'require augeas' was there, it would declare the augeas class, which would result in a duplicate definition when you have elsewhere something like this: $augeasversion = $::lsbdistcodename ? { squeeze => '0.10.0-1~bpo60+3', wheezy => latest } class { 'augeas': version => $augeasversion } changing it to an ordering parameter makes sure that it is installed and working before anything else happens
-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"\'',