X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=a9161888887e2c7aa68d257ddc2a5e00b5870918;hb=f421a040226aaf21f439642b854576a4dbc86735;hp=00ea2f93c65b9b1b10d125959a61e325f8bca4ab;hpb=2f39941e77e4bcf2cdc58db2444158ab2b0e9c37;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 00ea2f93c..a91618888 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -5,7 +5,7 @@ class ssh {
         }
 
 	file { "/etc/ssh/ssh_config":
-		source  => [ "puppet:///ssh/ssh_config" ],
+		content => template("ssh/ssh_config.erb"),
 		require => Package["openssh-client"]
                 ;
 	       "/etc/ssh/sshd_config":
@@ -13,15 +13,34 @@ class ssh {
 		require => Package["openssh-server"],
                 notify  => Exec["ssh restart"]
                 ;
-#              "/etc/ssh/userkeys/root":
-#               content => template("ssh/authorized_keys.erb" ],
-#               mode    => 444,
-#               require => Package["openssh-server"]
-#               ;
+              "/etc/ssh/userkeys":
+		ensure  => directory,
+		owner   => root,
+		group   => root,
+		mode    => 755,
+                ;
+              "/etc/ssh/userkeys/root":
+                content => template("ssh/authorized_keys.erb"),
+                mode    => 444,
+                require => Package["openssh-server"]
+                ;
 	}
 
         exec { "ssh restart":
             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)"
+        }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: