convert ssh to new rule format

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

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index b11a212..9d272a2 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -13,8 +13,14 @@ class ssh {
                require => Package["openssh-server"],
                 notify  => Exec["ssh restart"]
                 ;
+              "/etc/ssh/userkeys":
+               ensure  => directory,
+               owner   => root,
+               group   => root,
+               mode    => 755,
+                ;
               "/etc/ssh/userkeys/root":
-                content => template("ssh/authorized_keys.erb" ],
+                content => template("ssh/authorized_keys.erb"),
                 mode    => 444,
                 require => Package["openssh-server"]
                 ;
@@ -24,4 +30,14 @@ class ssh {
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             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)"
+        }
 }