merged with riseup module, various cleaning up

1 files changed, 32 insertions, 28 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index b249974..2ac2385 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,31 +1,35 @@
 class sshd::base {     
-    file { 'sshd_config':
-        path => '/etc/ssh/sshd_config',
-        owner => root,
-        group => 0,
-        mode => 600,
-        content => $lsbdistcodename ? {
-          '' => template("sshd/sshd_config/${operatingsystem}.erb"),
-          default => template ("sshd/sshd_config/${operatingsystem}_${lsbdistcodename}.erb"),
-        },
-        notify => Service[sshd],
-    }
-    # Now add the key, if we've got one
-    case $sshrsakey_key {
-        '': { info("no sshrsakey on $fqdn") }
-        default: {
-            @@sshkey{"$hostname.$domain":
-                type => ssh-rsa,
-                key => $sshrsakey_key,
-                ensure => present,
-            }
-        }
-    }
-    service{'sshd':
-        name => 'sshd',
-        enable => true,
-        ensure => running,
-        hasstatus => true,
-		    require => File[sshd_config],
+  file { 'sshd_config':
+    path => '/etc/ssh/sshd_config',
+    content => $lsbdistcodename ? {
+      '' => template("sshd/sshd_config/${operatingsystem}.erb"),
+      default => template ("sshd/sshd_config/${operatingsystem}_${lsbdistcodename}.erb"),
+    },
+    notify => Service[sshd],
+    owner => root, group => 0, mode => 600;
+  }
+
+  # Now add the key, if we've got one
+  case $sshrsakey_key {
+    '': { info("no sshrsakey on $fqdn") }
+    default: {
+      @@sshkey{"$hostname.$domain":
+        type => ssh-rsa,
+        key => $sshrsakey_key,
+        ensure => present,
+      }
+      @@sshkey{"$ipaddress":
+        type => ssh-rsa,
+        key => $sshrsakey,
+        ensure => present,
+      }
     }
+  }
+  service{'sshd':
+    name => 'sshd',
+    enable => true,
+    ensure => running,
+    hasstatus => true,
+    require => File[sshd_config],
+  }
 }