Moving all sshd declarations to nodo class

diff --git a/manifests/host.pp b/manifests/host.pp
index 2762e9129ec46d61c3832c7d5df0980169cd495e..9464e967abc21ef005bdcd1433d5dbdb5dd0aa9a 100644 (file)
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -31,26 +31,6 @@ class nodo::host inherits nodo {
     default: { include ntpdate  }
   }
 
-  # SSH Server
-  #
-  # We need to restrict listen address so multiple instances
-  # can live together in the same physical host.
-  #
-  case $sshd_listen_address {
-    '': { $sshd_listen_address = [ "$ipaddress", '127.0.0.1' ] }
-  }
-
-  class { 'sshd':
-    listen_address          => $sshd_listen_address,
-    password_authentication => $sshd_password_authentication,
-    shared_ip               => $sshd_shared_ip,
-    tcp_forwarding          => $sshd_tcp_forwarding,
-    hardened_ssl            => $sshd_hardened_ssl,
-    print_motd              => $sshd_print_motd,
-    ports                   => $sshd_ports,
-    use_pam                 => $sshd_use_pam,
-  }
-
   backupninja::sys { "sys":
     ensure => present,
   }

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 873c07576110e3f93b278d466fad217425b86bb1..8d746d0690878f79502673d92d879b93f49298c4 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -40,12 +40,6 @@ class nodo {
 
   # Apt configuration
   if $use_apt != false {
-    # TODO: remove this in the future after all old nodes
-    #       have applied the catalog.
-    file { '/etc/apt/sources.list.d/debian-backports.list':
-      ensure => absent,
-    }
-
     class { 'apt':
       include_src      => hiera('nodo::apt_include_src', false),
       use_next_release => hiera('nodo::apt_use_next_release', false),
@@ -85,6 +79,26 @@ class nodo {
   $sshd_hardened_ssl            = "yes"
   $sshd_print_motd              = "yes"
 
+  # SSH Server
+  #
+  # We need to restrict listen address so multiple instances
+  # can live together in the same physical host.
+  #
+  case $sshd_listen_address {
+    '': { $sshd_listen_address = [ "$ipaddress", '127.0.0.1' ] }
+  }
+
+  class { 'sshd':
+    listen_address          => $sshd_listen_address,
+    password_authentication => $sshd_password_authentication,
+    shared_ip               => $sshd_shared_ip,
+    tcp_forwarding          => $sshd_tcp_forwarding,
+    hardened_ssl            => $sshd_hardened_ssl,
+    print_motd              => $sshd_print_motd,
+    ports                   => $sshd_ports,
+    use_pam                 => $sshd_use_pam,
+  }
+
   file { "/etc/hostname":
     owner   => "root",
     group   => "root",
@@ -94,7 +108,7 @@ class nodo {
   }
 
   file { "/etc/rc.local":
-    source  => "puppet://$server/modules/nodo/etc/rc.local",
+    source  => "puppet:///modules/nodo/etc/rc.local",
     owner   => "root",
     group   => "root",
     mode    => 0755,

diff --git a/manifests/plug.pp b/manifests/plug.pp
index 913ab6be7023b064b96e7c0462857565a04dcb02..58aa844784ebbc889f98fc195ee945aa4230a5da 100644 (file)
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -7,17 +7,6 @@ class nodo::plug inherits nodo {
   include resolver
   include monkeysphere_nodo
 
-  class { 'sshd':
-    listen_address          => $sshd_listen_address,
-    password_authentication => $sshd_password_authentication,
-    shared_ip               => $sshd_shared_ip,
-    tcp_forwarding          => $sshd_tcp_forwarding,
-    hardened_ssl            => $sshd_hardened_ssl,
-    print_motd              => $sshd_print_motd,
-    ports                   => $sshd_ports,
-    use_pam                 => $sshd_use_pam,
-  }
-
   backupninja::sys { "sys":
     ensure     => present,
   }

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 0e617507456ddcbd4ff35f3cf01ded85368d506b..9feb030482fe6e8b4bde95e8a1a87134ee340549 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -3,17 +3,6 @@ class nodo::vserver inherits nodo {
 
   class { 'syslog-ng::vserver': }
 
-  class { 'sshd':
-    listen_address          => $sshd_listen_address,
-    password_authentication => $sshd_password_authentication,
-    shared_ip               => $sshd_shared_ip,
-    tcp_forwarding          => $sshd_tcp_forwarding,
-    hardened_ssl            => $sshd_hardened_ssl,
-    print_motd              => $sshd_print_motd,
-    ports                   => $sshd_ports,
-    use_pam                 => $sshd_use_pam,
-  }
-
   backupninja::sys { "sys":
     ensure     => present,
     partitions => false,