move all files to explicit new-style module/ paths

[dsa-puppet.git] / modules / ssh / manifests / init.pp

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 452ce5dfbaaa24e91e047650d03b00e9dc4aceee..271c8bdff6155c00a448f453ca4dbae244e52129 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -4,15 +4,8 @@ class ssh {
                 openssh-server: ensure => installed;
         }
 
-        case $hostname {
-                bartok, beethoven: {
-                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-                }
-        }
-
-
        file { "/etc/ssh/ssh_config":
-               source  => [ "puppet:///ssh/ssh_config" ],
+               source  => [ "puppet:///modules/ssh/ssh_config" ],
                require => Package["openssh-client"]
                 ;
               "/etc/ssh/sshd_config":
@@ -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: