Adding nodo::host class

1 files changed, 1 insertions, 62 deletions

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 4e85f10..0d797fc 100644
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -1,67 +1,6 @@
-class nodo::physical inherits nodo {
-  include initramfs
-  include modprobe
-  include firewire
-  include sysctl
+class nodo::physical inherits nodo::host {
   include ups
-  include utils::physical
   include smartmontools
-  include resolver
-  include monkeysphere_nodo
-
-  class { 'syslog-ng': }
-
-  # Firewall configuration
-  include firewall
-
-  # Vserver configuration
-  $vserver_vdirbase = "/var/vservers"
-  include vserver::host
-
-  if $use_nagios != false {
-    if $use_nagios_fqdn == true {
-      include nagios::target::fqdn
-    }
-    else {
-      include nagios::target
-    }
-    nagios::service::ping { "$fqdn": }
-  }
-
-  # Time configuration
-  case $ntpdate {
-    false:   { include timezone }
-    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,
-  }
-
-  # Munin configuration
-  munin_node { "$hostname":
-    port => '4900',
-  }
 
   # SMART monitoring
   include munin::plugins::smart