Rollback

diff --git a/manifests/init.pp b/manifests/init.pp
index 61fb1c959271a237e2b02875bc6ff6796251b417..f9029efb14fc43d2fc677a71c42fa314668f6bb5 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,7 +5,7 @@ class firewall(
   $out_bandwidth = hiera('firewall::out_bandwidth', '2mbit'),
   $eth0_options  = hiera('firewall::eth0_options',  'tcpflags,blacklist,routefilter,nosmurfs,logmartians')
 ) {
-  include shorewall
+  class { 'shorewall': }
 
   $rfc1918 = $local_net ? {
     true    => true,

diff --git a/manifests/nas.pp b/manifests/nas.pp
index 9bd595ad8240892d14dda0432c5295d21334007d..8857cadded54ca13f96db35211e617da53b4e4bb 100644 (file)
--- a/manifests/nas.pp
+++ b/manifests/nas.pp
@@ -12,7 +12,6 @@ class firewall::nas(
   $daap    = false,
   $avahi   = false
 ) {
-  # Basic firewall rules
 
   if $ftp == true {
     include shorewall::rules::ftp