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

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index b00d774e7..9d272a224 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -17,7 +17,7 @@ class ssh {
 		ensure  => directory,
 		owner   => root,
 		group   => root,
-		mode    => 775,
+		mode    => 755,
                 ;
               "/etc/ssh/userkeys/root":
                 content => template("ssh/authorized_keys.erb"),
@@ -30,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)"
+        }
 }