From 3cdebf3ebe73cb2859dc852dcc73a8ee2d60e976 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 20 Aug 2013 19:45:56 -0400
Subject: install a preliminary firewall that blocks everything, except ssh for
 the cases when shorewall doesn't properly come up, ensuring that it fails
 safe (#3339)

Change-Id: Id4f0bf6cf25f420aa2ad67635b37ae95f54e3d38
---
 .../modules/site_shorewall/manifests/defaults.pp   | 28 ++++++++++++++++++++--
 puppet/modules/site_shorewall/manifests/sshd.pp    |  6 +++++
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_shorewall')

diff --git a/puppet/modules/site_shorewall/manifests/defaults.pp b/puppet/modules/site_shorewall/manifests/defaults.pp
index c62c9307..35e47982 100644
--- a/puppet/modules/site_shorewall/manifests/defaults.pp
+++ b/puppet/modules/site_shorewall/manifests/defaults.pp
@@ -1,4 +1,5 @@
 class site_shorewall::defaults {
+
   include shorewall
   include site_config::params
 
@@ -18,8 +19,6 @@ class site_shorewall::defaults {
     options   => 'tcpflags,blacklist,nosmurfs';
   }
 
-  shorewall::routestopped { $site_config::params::interface: }
-
   shorewall::policy {
     'fw-to-all':
       sourcezone      => 'fw',
@@ -42,5 +41,30 @@ class site_shorewall::defaults {
         order       => 200;
   }
 
+  package { 'shorewall-init':
+    ensure => installed
+  }
+
+  augeas {
+    # stop instead of clear firewall on shutdown
+    'shorewall_SAFESTOP':
+      changes => 'set /files/etc/shorewall/shorewall.conf/SAFESTOP Yes',
+      lens    => 'Shellvars.lns',
+      incl    => '/etc/shorewall/shorewall.conf',
+      notify  => Service[shorewall];
+    # require that the interface exist
+    'shorewall_REQUIRE_INTERFACE':
+      changes => 'set /files/etc/shorewall/shorewall.conf/REQUIRE_INTERFACE Yes',
+      lens    => 'Shellvars.lns',
+      incl    => '/etc/shorewall/shorewall.conf',
+      notify  => Service[shorewall];
+    # configure shorewall-init
+    'shorewall-init':
+      changes => 'set /files/etc/default/shorewall-init/PRODUCTS shorewall',
+      lens    => 'Shellvars.lns',
+      incl    => '/etc/default/shorewall-init',
+      require => [ Package['shorewall-init'], Service['shorewall'] ]
+  }
+
   include site_shorewall::sshd
 }
diff --git a/puppet/modules/site_shorewall/manifests/sshd.pp b/puppet/modules/site_shorewall/manifests/sshd.pp
index a8e09e42..88b4102c 100644
--- a/puppet/modules/site_shorewall/manifests/sshd.pp
+++ b/puppet/modules/site_shorewall/manifests/sshd.pp
@@ -21,4 +21,10 @@ class site_shorewall::sshd {
         action      => 'leap_sshd(ACCEPT)',
         order       => 200;
   }
+
+  # setup a routestopped rule to allow ssh when shorewall is stopped
+  shorewall::routestopped { $site_config::params::interface:
+    options => "-   tcp   ${ssh_port}"
+  }
+
 }
-- 
cgit v1.2.3