From: mh <mh@immerda.ch>
Date: Thu, 28 Feb 2013 19:38:07 +0000 (+0100)
Subject: only manage the config_path if we do not manage the config file
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3139e5a544868542a7534c6dd2e09f69d0c046a2;p=puppet-shorewall.git

only manage the config_path if we do not manage the config file
---

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: