1 files changed, 40 insertions, 31 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 4324553..4ee8747 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,39 +1,48 @@
+# base things for shorewall
 class shorewall::base {
 
-    package { 'shorewall':
-        ensure => $shorewall::ensure_version,
-    }
+  package { 'shorewall':
+    ensure => $shorewall::ensure_version,
+  }
 
-    # This file has to be managed in place, so shorewall can find it
-    file {
-      '/etc/shorewall/shorewall.conf':
-        require => Package[shorewall],
-        notify => Service[shorewall],
-        owner => root, group => 0, mode => 0644;
-      '/etc/shorewall/puppet':
-        ensure => directory,
-        require => Package[shorewall],
-        owner => root, group => 0, mode => 0644;
-    }
+  # This file has to be managed in place, so shorewall can find it
+  file {
+    '/etc/shorewall/shorewall.conf':
+      require => Package[shorewall],
+      notify  => Service[shorewall],
+      owner   => root,
+      group   => 0,
+      mode    => '0644';
+    '/etc/shorewall/puppet':
+      ensure  => directory,
+      require => Package[shorewall],
+      owner   => root,
+      group   => 0,
+      mode    => '0644';
+  }
 
-    if $shorewall::conf_source {
-      File['/etc/shorewall/shorewall.conf']{
-        source => $shorewall::conf_source,
-      }
+  if $shorewall::conf_source {
+    File['/etc/shorewall/shorewall.conf']{
+      source => $shorewall::conf_source,
     }
+  } else {
 
-    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 augeas
 
-    service{shorewall:
-        ensure  => running,
-        enable  => true,
-        hasstatus => true,
-        hasrestart => true,
-        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':
+    ensure      => running,
+    enable      => true,
+    hasstatus   => true,
+    hasrestart  => true,
+    require     => Package['shorewall'],
+  }
 }