From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 31 May 2013 02:29:43 +0000 (-0300)
Subject: Rollback
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8e2a0e205fafd0d1a287e9dc8c11f1366d0bcbe3;p=puppet-firewall.git

Rollback
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 61fb1c9..f9029ef 100644
--- 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 9bd595a..8857cad 100644
--- 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