include modules_dir in class

diff --git a/manifests/init.pp b/manifests/init.pp
index dd03c664bd4c6da0267a8caf5cc25d41ab7ef161..f4a18484ea9635a9cc45c5f38c8a901f91c9668b 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,49 +1,51 @@
-modules_dir { "shorewall": }
-
 class shorewall { 
 
-    case $operatingsystem {
-        gentoo: { include shorewall::gentoo }
-        debian: { include shorewall::debian }
-        centos: { include shorewall::base }
-        ubuntu: {
-          case $lsbdistcodename {
-            karmic: { include shorewall::ubuntu::karmic }
-            default: { include shorewall::debian }
-          }
-        }
-        default: { notice "unknown operatingsystem: $operatingsystem" 
-                  include shorewall::base }
-    }
+  modules_dir { "shorewall": }
 
-    file {"/var/lib/puppet/modules/shorewall":
-        ensure => directory,
-        force => true,
-        owner => root, group => 0, mode => 0755; 
+  case $operatingsystem {
+    gentoo: { include shorewall::gentoo }
+    debian: { include shorewall::debian }
+    centos: { include shorewall::base }
+    ubuntu: {
+    case $lsbdistcodename {
+      karmic: { include shorewall::ubuntu::karmic }
+      default: { include shorewall::debian }
+      }
     }
+    default: {
+      notice "unknown operatingsystem: $operatingsystem" 
+                 include shorewall::base
+    }
+  }
+
+  file {"/var/lib/puppet/modules/shorewall":
+    ensure => directory,
+    force => true,
+    owner => root, group => 0, mode => 0755; 
+  }
 
-    # See http://www.shorewall.net/3.0/Documentation.htm#Zones
-    shorewall::managed_file{ zones: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Interfaces
-    shorewall::managed_file{ interfaces: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Hosts
-    shorewall::managed_file { hosts: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Policy
-    shorewall::managed_file { policy: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Rules
-    shorewall::managed_file { rules: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Masq
-    shorewall::managed_file{ masq: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#ProxyArp
-    shorewall::managed_file { proxyarp: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#NAT
-    shorewall::managed_file { nat: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Blacklist
-    shorewall::managed_file { blacklist: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#rfc1918
-    shorewall::managed_file { rfc1918: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Routestopped
-    shorewall::managed_file { routestopped: }
-    # See http://www.shorewall.net/3.0/Documentation.htm#Variables 
-    shorewall::managed_file { params: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Zones
+  shorewall::managed_file{ zones: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Interfaces
+  shorewall::managed_file{ interfaces: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Hosts
+  shorewall::managed_file { hosts: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Policy
+  shorewall::managed_file { policy: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Rules
+  shorewall::managed_file { rules: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Masq
+  shorewall::managed_file{ masq: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#ProxyArp
+  shorewall::managed_file { proxyarp: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#NAT
+  shorewall::managed_file { nat: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Blacklist
+  shorewall::managed_file { blacklist: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#rfc1918
+  shorewall::managed_file { rfc1918: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Routestopped
+  shorewall::managed_file { routestopped: }
+  # See http://www.shorewall.net/3.0/Documentation.htm#Variables 
+  shorewall::managed_file { params: }
 }