summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-02-28 20:38:07 +0100
committermh <mh@immerda.ch>2013-02-28 20:38:07 +0100
commitc7aaea9b78f82ed2fb2c63571743c4e225a22a76 (patch)
tree33e19db406437afd170609dd7853df375b32ef2b
parent2ac0604026a808f91188e785a5c4d254eccf7d67 (diff)
only manage the config_path if we do not manage the config file
-rw-r--r--manifests/base.pp17
1 files changed, 9 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 7ee9f0c..6f39bcf 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -20,16 +20,17 @@ class shorewall::base {
File['/etc/shorewall/shorewall.conf']{
source => $shorewall::conf_source,
}
- }
+ } else {
- require augeas
+ require augeas
- augeas { 'shorewall_module_config_path':
- changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
- lens => 'Shellvars.lns',
- incl => '/etc/shorewall/shorewall.conf',
- notify => Service[shorewall],
- require => [ Package['shorewall'] ];
+ augeas { 'shorewall_module_config_path':
+ changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
+ lens => 'Shellvars.lns',
+ incl => '/etc/shorewall/shorewall.conf',
+ notify => Service[shorewall],
+ require => Package['shorewall'];
+ }
}
service{shorewall: