From 5bdeab5848f975317a215fd40574f8edd568480a Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 10 Dec 2009 23:45:12 +0100
Subject: re-add shorewall in rule :/

---
 manifests/client.pp | 22 +++++++++++-----------
 manifests/init.pp   |  4 ++++
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'manifests')

diff --git a/manifests/client.pp b/manifests/client.pp
index 2fc3a84..b650244 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,16 +1,16 @@
 # manifests/client.pp
 
 class sshd::client {
-    case $operatingsystem {
-        debian: { include sshd::client::debian }
-        default: { 
-            case $kernel {
-                linux: { include sshd::client::linux }
-                default:  { include sshd::client::base }
-            }
-        }
-    }
-    if $use_shorewall{
-      include shorewall::rules::out::ssh
+  case $operatingsystem {
+    debian: { include sshd::client::debian }
+    default: {
+      case $kernel {
+        linux: { include sshd::client::linux }
+        default:  { include sshd::client::base }
+      }
     }
+  }
+  if $use_shorewall{
+    include shorewall::rules::out::ssh
+  }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 83b26c1..88c48bb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -221,4 +221,8 @@ class sshd {
       default: { nagios::service{ "ssh_${fqdn}_port_${sshd_port}": check_command => "ssh_port!$sshd_port" } }
     }
   }
+
+  if $use_shorewall{
+    include shorewall::rules::ssh
+  }
 }
-- 
cgit v1.2.3