X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=e2248f84727deb7c032ae92d57e154997d3b0418;hb=422c7cbff1fa0db0b11f077a73a0227c9cc775ae;hp=9b253832cfbcf43e771c0b3e5749839b25c08c2a;hpb=45c80304279ca3f7e6db329cbf8e4566433ed35e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 9b253832c..e2248f847 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -4,13 +4,6 @@ class ssh {
                 openssh-server: ensure => installed;
         }
 
-        case $hostname {
-                bartok: {
-                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-                }
-        }
-
-
 	file { "/etc/ssh/ssh_config":
 		source  => [ "puppet:///ssh/ssh_config" ],
 		require => Package["openssh-client"]
@@ -38,4 +31,13 @@ class ssh {
             refreshonly => true,
         }
 
+        @ferm::rule { "dsa-ssh":
+                description     => "Allow SSH from DSA",
+                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
+        }
+        @ferm::rule { "dsa-ssh-v6":
+                description     => "Allow SSH from DSA",
+                domain          => "ip6",
+                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }"
+        }
 }