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

diff --git a/manifests/base.pp b/manifests/base.pp
index 7ee9f0cda7834cd8018c117545b35042b690b3d9..6f39bcfac7f94fea6b8e02ad142e8b3496cecc6a 100644 (file)
--- 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: