X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Fmanifests%2Finit.pp;h=13a7e0ba1c9e109a9c94578210194819e8ecf0a9;hb=e9f751d04d14a742e81f5ac90c2fd20d9d11bc32;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..13a7e0ba1 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -4,6 +4,13 @@ class ssh {
                 openssh-server: ensure => installed;
         }
 
+        case $hostname {
+                bartok: {
+                    $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+                }
+        }
+
+
 	file { "/etc/ssh/ssh_config":
 		source  => [ "puppet:///ssh/ssh_config" ],
 		require => Package["openssh-client"]
@@ -13,11 +20,17 @@ 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":