Upgrading ssh module

diff --git a/manifests/kvm.pp b/manifests/kvm.pp
index 2687a2408696c48f9bacf3c3bc3ccfcd98642ed5..2010cf9c93fdb2a9a793d51ed0bf0bab74a6a298 100644 (file)
--- a/manifests/kvm.pp
+++ b/manifests/kvm.pp
@@ -50,7 +50,15 @@ class nodo::kvm inherits nodo {
   case $sshd_listen_address {
     '': { $sshd_listen_address = [ "$ipaddress" ] }
   }
-  include sshd
+
+  class { 'sshd':
+    listen_address          => $sshd_listen_address,
+    password_authentication => $ssh_password_authentication,
+    shared_ip               => $ssh_shared_ip,
+    tcp_forwarding          => $ssh_tcp_forwarding,
+    hardened_ssl            => $ssh_hardened_ssl,
+    print_motd              => $ssh_print_motd,
+  }
 
   backupninja::sys { "sys":
     ensure => present,

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 1c959be6712738e27478b859401ce0e6d7da201f..03e8c7c615cfe3773aac7b97bddaccff7ded61e7 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -51,7 +51,15 @@ class nodo::physical inherits nodo {
   case $sshd_listen_address {
     '': { $sshd_listen_address = [ "$ipaddress", '127.0.0.1' ] }
   }
-  include sshd
+
+  class { 'sshd':
+    listen_address          => $sshd_listen_address,
+    password_authentication => $ssh_password_authentication,
+    shared_ip               => $ssh_shared_ip,
+    tcp_forwarding          => $ssh_tcp_forwarding,
+    hardened_ssl            => $ssh_hardened_ssl,
+    print_motd              => $ssh_print_motd,
+  }
 
   backupninja::sys { "sys":
     ensure => present,

diff --git a/manifests/plug.pp b/manifests/plug.pp
index 99bde89f9af4dc2227047d700a49b08465ab06ac..37c69c52e49205611d04cd43d60358c6bbe5d5db 100644 (file)
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -1,5 +1,4 @@
 class nodo::plug inherits nodo {
-  include sshd
   include ntpdate
   include syslog-ng
   include utils::plug
@@ -8,6 +7,15 @@ class nodo::plug inherits nodo {
   include resolver
   include monkeysphere_nodo
 
+  class { 'sshd':
+    listen_address          => $sshd_listen_address,
+    password_authentication => $ssh_password_authentication,
+    shared_ip               => $ssh_shared_ip,
+    tcp_forwarding          => $ssh_tcp_forwarding,
+    hardened_ssl            => $ssh_hardened_ssl,
+    print_motd              => $ssh_print_motd,
+  }
+
   backupninja::sys { "sys":
     ensure     => present,
   }

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index de2b2ef1d09faee4dee633fe6ab5707f657219c7..39746025ebc8947f425429989c6031fb6e35490d 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -3,6 +3,15 @@ class nodo::vserver inherits nodo {
   include timezone
   include syslog-ng::vserver
 
+  class { 'sshd':
+    listen_address          => $sshd_listen_address,
+    password_authentication => $ssh_password_authentication,
+    shared_ip               => $ssh_shared_ip,
+    tcp_forwarding          => $ssh_tcp_forwarding,
+    hardened_ssl            => $ssh_hardened_ssl,
+    print_motd              => $ssh_print_motd,
+  }
+
   backupninja::sys { "sys":
     ensure     => present,
     partitions => false,