Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 59fe97bd4800d8e667801766eb52ea776e231f2c..9b253832cfbcf43e771c0b3e5749839b25c08c2a 100644 (file)
--- 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,6 +20,12 @@ 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"),
                 mode    => 444,
@@ -24,4 +37,5 @@ class ssh {
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true,
         }
+
 }