summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-05-30 23:29:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-05-30 23:29:43 -0300
commit8e2a0e205fafd0d1a287e9dc8c11f1366d0bcbe3 (patch)
treeba5416d63fa23e3b440928d884718940c3d2b43a /manifests
parentfa7b8c1dda64371e6ec4698488de41df7b7a7ad0 (diff)
downloadpuppet-firewall-8e2a0e205fafd0d1a287e9dc8c11f1366d0bcbe3.tar.gz
puppet-firewall-8e2a0e205fafd0d1a287e9dc8c11f1366d0bcbe3.tar.bz2
Rollback
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/nas.pp1
2 files changed, 1 insertions, 2 deletions
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