X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=98add73820e1f33154cb8361eed03c1f61812c61;hb=906277d3c7c09fa4437fdc4a87cab4b7896bfe67;hp=452ce5dfbaaa24e91e047650d03b00e9dc4aceee;hpb=131d1d904fb3e556c4b46ac3c00c9861ae95e0c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 452ce5dfb..98add7382 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, beethoven: {
-                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-                }
-        }
-
-
 	file { "/etc/ssh/ssh_config":
 		source  => [ "puppet:///ssh/ssh_config" ],
 		require => Package["openssh-client"]
@@ -38,13 +31,16 @@ class ssh {
             refreshonly => true,
         }
 
-        ferm::rule { "dsa-ssh":
+        @ferm::rule { "dsa-ssh":
                 description     => "Allow SSH from DSA",
-                rule            => "proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }"
+                rule            => "&SERVICE_RANGE(tcp, ssh, \$SSH_SOURCES)"
         }
-        ferm::rule { "dsa-ssh-v6":
+        @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; }"
+                rule            => "&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)"
         }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: