X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=9d272a224c80efed8437ac61407979210c86ffac;hb=2b2591daf75e4430788da7055de3b25c7e3df5f3;hp=9b253832cfbcf43e771c0b3e5749839b25c08c2a;hpb=77043b45d263146c8b95bdd5f28fe4c87eaeb349;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 9b253832c..9d272a224 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            => "&SERVICE_RANGE(tcp, ssh, \$SSH_SOURCES)"
+        }
+        @ferm::rule { "dsa-ssh-v6":
+                description     => "Allow SSH from DSA",
+                domain          => "ip6",
+                rule            => "&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)"
+        }
 }