From 3ae6096fd3108d7edc1f1a98dbb6b11ba6d1fbd3 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 13 Apr 2013 16:32:23 -0300
Subject: Renaming base classes

---
 manifests/appliance.pp           |  7 -----
 manifests/base/appliance.pp      |  7 +++++
 manifests/base/desktop.pp        |  7 +++++
 manifests/base/host.pp           | 55 ++++++++++++++++++++++++++++++++++++++++
 manifests/base/kvm.pp            |  5 ++++
 manifests/base/laptop.pp         | 33 ++++++++++++++++++++++++
 manifests/base/personal.pp       | 37 +++++++++++++++++++++++++++
 manifests/base/physical.pp       | 21 +++++++++++++++
 manifests/base/plug.pp           | 21 +++++++++++++++
 manifests/base/removable.pp      |  9 +++++++
 manifests/base/server.pp         |  5 ++++
 manifests/base/vserver.pp        | 38 +++++++++++++++++++++++++++
 manifests/desktop.pp             |  7 -----
 manifests/host.pp                | 55 ----------------------------------------
 manifests/kvm.pp                 |  5 ----
 manifests/laptop.pp              | 33 ------------------------
 manifests/personal.pp            | 37 ---------------------------
 manifests/physical.pp            | 21 ---------------
 manifests/plug.pp                | 21 ---------------
 manifests/removable.pp           |  9 -------
 manifests/role/bitcoin.pp        |  2 +-
 manifests/role/desktop.pp        |  2 +-
 manifests/role/dns.pp            |  2 +-
 manifests/role/jabber.pp         |  2 +-
 manifests/role/kvm.pp            |  2 +-
 manifests/role/laptop.pp         |  2 +-
 manifests/role/mail.pp           |  2 +-
 manifests/role/master.pp         |  2 +-
 manifests/role/mumble.pp         |  2 +-
 manifests/role/nas/plug.pp       |  2 +-
 manifests/role/proxy.pp          |  2 +-
 manifests/role/router.pp         |  2 +-
 manifests/role/server.pp         |  2 +-
 manifests/role/storage.pp        |  2 +-
 manifests/role/test.pp           |  2 +-
 manifests/role/tor.pp            |  2 +-
 manifests/role/vserver.pp        |  2 +-
 manifests/role/web.pp            |  2 +-
 manifests/role/webdev/desktop.pp |  2 +-
 manifests/role/webdev/laptop.pp  |  2 +-
 manifests/role/yacy.pp           |  2 +-
 manifests/server.pp              |  5 ----
 manifests/vserver.pp             | 38 ---------------------------
 43 files changed, 259 insertions(+), 259 deletions(-)
 delete mode 100644 manifests/appliance.pp
 create mode 100644 manifests/base/appliance.pp
 create mode 100644 manifests/base/desktop.pp
 create mode 100644 manifests/base/host.pp
 create mode 100644 manifests/base/kvm.pp
 create mode 100644 manifests/base/laptop.pp
 create mode 100644 manifests/base/personal.pp
 create mode 100644 manifests/base/physical.pp
 create mode 100644 manifests/base/plug.pp
 create mode 100644 manifests/base/removable.pp
 create mode 100644 manifests/base/server.pp
 create mode 100644 manifests/base/vserver.pp
 delete mode 100644 manifests/desktop.pp
 delete mode 100644 manifests/host.pp
 delete mode 100644 manifests/kvm.pp
 delete mode 100644 manifests/laptop.pp
 delete mode 100644 manifests/personal.pp
 delete mode 100644 manifests/physical.pp
 delete mode 100644 manifests/plug.pp
 delete mode 100644 manifests/removable.pp
 delete mode 100644 manifests/server.pp
 delete mode 100644 manifests/vserver.pp

diff --git a/manifests/appliance.pp b/manifests/appliance.pp
deleted file mode 100644
index dea7625..0000000
--- a/manifests/appliance.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class nodo::appliance inherits nodo::physical {
-  class { 'sysctl::appliance': }
-
-  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
-    type => 'appliance',
-  }
-}
diff --git a/manifests/base/appliance.pp b/manifests/base/appliance.pp
new file mode 100644
index 0000000..73d95f5
--- /dev/null
+++ b/manifests/base/appliance.pp
@@ -0,0 +1,7 @@
+class nodo::base::appliance inherits nodo::base::physical {
+  class { 'sysctl::appliance': }
+
+  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
+    type => 'appliance',
+  }
+}
diff --git a/manifests/base/desktop.pp b/manifests/base/desktop.pp
new file mode 100644
index 0000000..bf9d2fe
--- /dev/null
+++ b/manifests/base/desktop.pp
@@ -0,0 +1,7 @@
+class nodo::base::desktop inherits nodo::base::personal {
+  include nodo::utils::desktop
+
+  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
+    type => 'desktop',
+  }
+}
diff --git a/manifests/base/host.pp b/manifests/base/host.pp
new file mode 100644
index 0000000..f57aeb4
--- /dev/null
+++ b/manifests/base/host.pp
@@ -0,0 +1,55 @@
+# Fully capable node able to host other nodes
+class nodo::base::host {
+  include nodo::subsystem::initramfs
+  include nodo::subsystem::modprobe
+  include nodo::subsystem::firewire
+  include nodo::subsystem::sysctl
+  include nodo::subsystem::resolver
+  include nodo::utils::physical
+  class { 'syslog-ng': }
+
+  monkeysphere_host { "${::hostname}": }
+
+  # Firewall
+  class { 'firewall': }
+
+  # Vserver
+  if $::lsbdistcodename == 'squeeze' {
+    $vserver = hiera('nodo::host::use_vserver', True)
+
+    if $vserver == true {
+      class { 'vserver::host':
+        vdirbase => "/var/vservers",
+      }
+    }
+  }
+
+  # Time
+  $ntpdate = hiera('nodo::host::ntpdate', True)
+  case $ntpdate {
+    false:   { class { 'timezone': } }
+    default: { class { 'ntpdate':  } }
+  }
+
+  # Backup
+  backupninja::sys { "sys":
+    ensure => present,
+  }
+
+  # Monitoring
+  if !defined(Class['nodo::subsystem::monitor']) {
+    class { 'nodo::subsystem::monitor':
+      type       => 'host',
+      use_nagios => hiera('nodo::host::use_nagios', True),
+    }
+  }
+
+  # Munin configuration
+  $munin = hiera('nodo::host::use_munin', True)
+  if $munin == true {
+    munin_node { "$hostname":
+      port => '4900',
+    }
+  }
+
+}
diff --git a/manifests/base/kvm.pp b/manifests/base/kvm.pp
new file mode 100644
index 0000000..06a7d10
--- /dev/null
+++ b/manifests/base/kvm.pp
@@ -0,0 +1,5 @@
+class nodo::base::kvm inherits nodo::base::host {
+  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
+    type => 'kvm',
+  }
+}
diff --git a/manifests/base/laptop.pp b/manifests/base/laptop.pp
new file mode 100644
index 0000000..dbafda7
--- /dev/null
+++ b/manifests/base/laptop.pp
@@ -0,0 +1,33 @@
+class nodo::base::laptop inherits nodo::base::personal {
+  include nodo::utils::laptop
+  include nodo::subsystem::dhclient
+  include firewall::wifi
+  include firewall::openvpn
+  include firewall::ppp
+
+  class { 'nodo::subsystem::fstab':
+    type => 'laptop',
+  }
+
+  $hibernate = hiera('nodo::laptop::hibernate', false)
+
+  class { 'nodo::subsystem::crypttab':
+    type => $hibernate ? {
+      false   => "laptop",
+      default => "laptop.hibernate",
+    },
+  }
+
+  # Hibernation
+  file { "/etc/initramfs-tools/conf.d/resume":
+    owner     => "root",
+    group     => "root",
+    mode      => 0644,
+    content   => "RESUME=/dev/mapper/cswap\n",
+    notify    => Exec['update-initramfs'],
+    ensure    => $hibernate ? {
+      false   => absent,
+      default => present,
+    },
+  }
+}
diff --git a/manifests/base/personal.pp b/manifests/base/personal.pp
new file mode 100644
index 0000000..5aa28ad
--- /dev/null
+++ b/manifests/base/personal.pp
@@ -0,0 +1,37 @@
+# Personal computer
+class nodo::base::personal {
+  include nodo::physical
+  include nodo::utils::personal
+  include autossh
+
+  class { 'nodo::subsystem::pam': }
+  class { 'nodo::subsystem::xorg': }
+
+  if $::lsbdistcodename == 'squeeze' {
+    include nodo::subsystem::gdm
+  }
+  else {
+    include nodo::subsystem::gdm3
+  }
+
+  # Media folders and groups
+  class { [ 'nodo::subsystem::media::folders', 'nodo::subsystem::media::groups' ]: }
+
+  # Mountpoint for encrypted home folders
+  file { [ '/mnt/crypt/', '/mnt/crypt/home' ]:
+    ensure => directory,
+  }
+
+  # Misc user data
+  file { [ "/var/data/code", "/var/data/crypt", "/var/data/crypt/home", "/var/data/load" ]:
+    ensure  => directory,
+    mode    => 0755,
+    require => File['/var/cache/media'],
+  }
+
+  # Development
+  file { [ "/var/cache/vagrant", "/var/cache/virtualbox" ]:
+    ensure => directory,
+    mode   => 0755,
+  }
+}
diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp
new file mode 100644
index 0000000..e01bfb2
--- /dev/null
+++ b/manifests/base/physical.pp
@@ -0,0 +1,21 @@
+class nodo::base::physical inherits nodo::base::host {
+  class { [ 'nodo::subsystem::ups', 'smartmontools' ]: }
+
+  # SMART monitoring
+  $munin = hiera('nodo::host::use_munin', True)
+  if $munin == true {
+    include munin::plugins::smart
+    munin::plugin { 'smart_sda':
+      ensure => 'smart_',
+      config => "user root\ngroup disk",
+    }
+  }
+
+  # Entropy key
+  $ekey_masterkey = hiera('nodo::physical::ekey_masterkey', '')
+  if $ekey_masterkey != '' {
+    class { "ekeyd":
+      ekeyd_masterkey => $ekey_masterkey,
+    }
+  }
+}
diff --git a/manifests/base/plug.pp b/manifests/base/plug.pp
new file mode 100644
index 0000000..17ce366
--- /dev/null
+++ b/manifests/base/plug.pp
@@ -0,0 +1,21 @@
+class nodo::base::plug {
+  include syslog-ng
+  include nodo::utils::plug
+  include nodo::utils::physical
+  include nodo::utils::storage::archive
+  include nodo::subsystem::sysctl
+  include nodo::subsystem::resolver
+
+  monkeysphere_host { "${::hostname}": }
+
+  class { [ 'ntpdate', 'firewall' ]:  }
+
+  backupninja::sys { "sys":
+    ensure     => present,
+  }
+
+  # Munin configuration
+  munin_node { "${::hostname}":
+    port => '4900',
+  }
+}
diff --git a/manifests/base/removable.pp b/manifests/base/removable.pp
new file mode 100644
index 0000000..d13b5ee
--- /dev/null
+++ b/manifests/base/removable.pp
@@ -0,0 +1,9 @@
+class nodo::base::removable inherits nodo::base::desktop {
+  File["/etc/fstab"] {
+    source  => "puppet:///modules/nodo/etc/fstab/removable",
+  }
+
+  File["/etc/crypttab"] {
+    source  => "puppet:///modules/nodo/etc/crypttab/removable",
+  }
+}
diff --git a/manifests/base/server.pp b/manifests/base/server.pp
new file mode 100644
index 0000000..93cce4c
--- /dev/null
+++ b/manifests/base/server.pp
@@ -0,0 +1,5 @@
+class nodo::base::server inherits nodo::base::physical {
+  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
+    type => 'server',
+  }
+}
diff --git a/manifests/base/vserver.pp b/manifests/base/vserver.pp
new file mode 100644
index 0000000..433be5a
--- /dev/null
+++ b/manifests/base/vserver.pp
@@ -0,0 +1,38 @@
+class nodo::base::vserver {
+  class { 'timezone': }
+  class { 'syslog-ng::vserver': }
+
+  backupninja::sys { "sys":
+    ensure     => present,
+    partitions => false,
+    hardware   => false,
+    dosfdisk   => false,
+    dohwinfo   => false,
+  }
+
+  $hosting_type = hiera('nodo::vserver::hosting_type', 'direct')
+
+  case $hosting_type {
+    "direct": {
+      # Apply munin and monkeysphere configuration for
+      # for directly hosted nodes.
+      Munin_node        <<| title == $::hostname |>>
+      Monkeysphere_host <<| title == $::hostname |>>
+    }
+    "third-party": {
+      # Apply munin and monkeysphere configuration for
+      # nodes hosted by third-parties.
+      munin_node { "${::hostname}": }
+      monkeysphere_host { "${::hostname}":
+        port => hiera('nodo::vserver::ssh_port', '22'),
+      }
+
+      # Nagios configuration
+      class { 'nodo::subsystem::monitor':
+        type       => 'vserver',
+        use_nagios => hiera('nodo::vserver::use_nagios', false),
+      }
+    }
+  }
+
+}
diff --git a/manifests/desktop.pp b/manifests/desktop.pp
deleted file mode 100644
index 7e83732..0000000
--- a/manifests/desktop.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class nodo::desktop inherits nodo::personal {
-  include nodo::utils::desktop
-
-  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
-    type => 'desktop',
-  }
-}
diff --git a/manifests/host.pp b/manifests/host.pp
deleted file mode 100644
index ee87e2f..0000000
--- a/manifests/host.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-# Fully capable node able to host other nodes
-class nodo::host {
-  include nodo::subsystem::initramfs
-  include nodo::subsystem::modprobe
-  include nodo::subsystem::firewire
-  include nodo::subsystem::sysctl
-  include nodo::subsystem::resolver
-  include nodo::utils::physical
-  class { 'syslog-ng': }
-
-  monkeysphere_host { "${::hostname}": }
-
-  # Firewall
-  class { 'firewall': }
-
-  # Vserver
-  if $::lsbdistcodename == 'squeeze' {
-    $vserver = hiera('nodo::host::use_vserver', True)
-
-    if $vserver == true {
-      class { 'vserver::host':
-        vdirbase => "/var/vservers",
-      }
-    }
-  }
-
-  # Time
-  $ntpdate = hiera('nodo::host::ntpdate', True)
-  case $ntpdate {
-    false:   { class { 'timezone': } }
-    default: { class { 'ntpdate':  } }
-  }
-
-  # Backup
-  backupninja::sys { "sys":
-    ensure => present,
-  }
-
-  # Monitoring
-  if !defined(Class['nodo::subsystem::monitor']) {
-    class { 'nodo::subsystem::monitor':
-      type       => 'host',
-      use_nagios => hiera('nodo::host::use_nagios', True),
-    }
-  }
-
-  # Munin configuration
-  $munin = hiera('nodo::host::use_munin', True)
-  if $munin == true {
-    munin_node { "$hostname":
-      port => '4900',
-    }
-  }
-
-}
diff --git a/manifests/kvm.pp b/manifests/kvm.pp
deleted file mode 100644
index 11f3dde..0000000
--- a/manifests/kvm.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class nodo::kvm inherits nodo::host {
-  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
-    type => 'kvm',
-  }
-}
diff --git a/manifests/laptop.pp b/manifests/laptop.pp
deleted file mode 100644
index 1ed77b7..0000000
--- a/manifests/laptop.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-class nodo::laptop inherits nodo::personal {
-  include nodo::utils::laptop
-  include nodo::subsystem::dhclient
-  include firewall::wifi
-  include firewall::openvpn
-  include firewall::ppp
-
-  class { 'nodo::subsystem::fstab':
-    type => 'laptop',
-  }
-
-  $hibernate = hiera('nodo::laptop::hibernate', false)
-
-  class { 'nodo::subsystem::crypttab':
-    type => $hibernate ? {
-      false   => "laptop",
-      default => "laptop.hibernate",
-    },
-  }
-
-  # Hibernation
-  file { "/etc/initramfs-tools/conf.d/resume":
-    owner     => "root",
-    group     => "root",
-    mode      => 0644,
-    content   => "RESUME=/dev/mapper/cswap\n",
-    notify    => Exec['update-initramfs'],
-    ensure    => $hibernate ? {
-      false   => absent,
-      default => present,
-    },
-  }
-}
diff --git a/manifests/personal.pp b/manifests/personal.pp
deleted file mode 100644
index 90f36ae..0000000
--- a/manifests/personal.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Personal computer
-class nodo::personal {
-  include nodo::physical
-  include nodo::utils::personal
-  include autossh
-
-  class { 'nodo::subsystem::pam': }
-  class { 'nodo::subsystem::xorg': }
-
-  if $::lsbdistcodename == 'squeeze' {
-    include nodo::subsystem::gdm
-  }
-  else {
-    include nodo::subsystem::gdm3
-  }
-
-  # Media folders and groups
-  class { [ 'nodo::subsystem::media::folders', 'nodo::subsystem::media::groups' ]: }
-
-  # Mountpoint for encrypted home folders
-  file { [ '/mnt/crypt/', '/mnt/crypt/home' ]:
-    ensure => directory,
-  }
-
-  # Misc user data
-  file { [ "/var/data/code", "/var/data/crypt", "/var/data/crypt/home", "/var/data/load" ]:
-    ensure  => directory,
-    mode    => 0755,
-    require => File['/var/cache/media'],
-  }
-
-  # Development
-  file { [ "/var/cache/vagrant", "/var/cache/virtualbox" ]:
-    ensure => directory,
-    mode   => 0755,
-  }
-}
diff --git a/manifests/physical.pp b/manifests/physical.pp
deleted file mode 100644
index c2d451d..0000000
--- a/manifests/physical.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class nodo::physical inherits nodo::host {
-  class { [ 'nodo::subsystem::ups', 'smartmontools' ]: }
-
-  # SMART monitoring
-  $munin = hiera('nodo::host::use_munin', True)
-  if $munin == true {
-    include munin::plugins::smart
-    munin::plugin { 'smart_sda':
-      ensure => 'smart_',
-      config => "user root\ngroup disk",
-    }
-  }
-
-  # Entropy key
-  $ekey_masterkey = hiera('nodo::physical::ekey_masterkey', '')
-  if $ekey_masterkey != '' {
-    class { "ekeyd":
-      ekeyd_masterkey => $ekey_masterkey,
-    }
-  }
-}
diff --git a/manifests/plug.pp b/manifests/plug.pp
deleted file mode 100644
index 858ba0a..0000000
--- a/manifests/plug.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class nodo::plug {
-  include syslog-ng
-  include nodo::utils::plug
-  include nodo::utils::physical
-  include nodo::utils::storage::archive
-  include nodo::subsystem::sysctl
-  include nodo::subsystem::resolver
-
-  monkeysphere_host { "${::hostname}": }
-
-  class { [ 'ntpdate', 'firewall' ]:  }
-
-  backupninja::sys { "sys":
-    ensure     => present,
-  }
-
-  # Munin configuration
-  munin_node { "${::hostname}":
-    port => '4900',
-  }
-}
diff --git a/manifests/removable.pp b/manifests/removable.pp
deleted file mode 100644
index 16f0157..0000000
--- a/manifests/removable.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class nodo::removable inherits nodo::desktop {
-  File["/etc/fstab"] {
-    source  => "puppet:///modules/nodo/etc/fstab/removable",
-  }
-
-  File["/etc/crypttab"] {
-    source  => "puppet:///modules/nodo/etc/crypttab/removable",
-  }
-}
diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp
index 7e957ba..e1e7e08 100644
--- a/manifests/role/bitcoin.pp
+++ b/manifests/role/bitcoin.pp
@@ -1,4 +1,4 @@
-class nodo::role::bitcoin inherits nodo::vserver {
+class nodo::role::bitcoin inherits nodo::base::vserver {
   include nodo::role::vserver
   include onion
   include onion::socks
diff --git a/manifests/role/desktop.pp b/manifests/role/desktop.pp
index 164b2f3..73e7b0f 100644
--- a/manifests/role/desktop.pp
+++ b/manifests/role/desktop.pp
@@ -1,3 +1,3 @@
 # General purpose desktop
-class nodo::role::desktop inherits nodo::desktop {
+class nodo::role::desktop inherits nodo::base::desktop {
 }
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index a439092..52e1d50 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -1,4 +1,4 @@
-class nodo::role::dns inherits nodo::vserver {
+class nodo::role::dns inherits nodo::base::vserver {
   include bind
 
   if defined('dns') {
diff --git a/manifests/role/jabber.pp b/manifests/role/jabber.pp
index b510ccd..9303683 100644
--- a/manifests/role/jabber.pp
+++ b/manifests/role/jabber.pp
@@ -1,4 +1,4 @@
-class nodo::role::jabber inherits nodo::vserver {
+class nodo::role::jabber inherits nodo::base::vserver {
   include ssl
   include ejabberd
 
diff --git a/manifests/role/kvm.pp b/manifests/role/kvm.pp
index 71f4fa7..31d046d 100644
--- a/manifests/role/kvm.pp
+++ b/manifests/role/kvm.pp
@@ -1,3 +1,3 @@
 # A general purpose kvm instance
-class nodo::role::kvm inherits nodo::kvm {
+class nodo::role::kvm inherits nodo::base::kvm {
 }
diff --git a/manifests/role/laptop.pp b/manifests/role/laptop.pp
index 0f9d407..a324718 100644
--- a/manifests/role/laptop.pp
+++ b/manifests/role/laptop.pp
@@ -1,3 +1,3 @@
 # General purpose laptop
-class nodo::role::laptop inherits nodo::laptop {
+class nodo::role::laptop inherits nodo::base::laptop {
 }
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 4c33ed4..255588a 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,3 +1,3 @@
 class nodo::role::mail {
-  class { [ 'nodo::vserver', 'mail::system' ]: }
+  class { [ 'nodo::role::vserver', 'mail::system' ]: }
 }
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index 2adb8a5..804ea78 100644
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -33,7 +33,7 @@ class nodo::role::master {
   }
 
   # These should be included after puppetmaster
-  include nodo::vserver
+  include nodo::role::vserver
   include database
   include git::daemon
   include websites::admin
diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp
index 764c0d8..7c7c0a2 100644
--- a/manifests/role/mumble.pp
+++ b/manifests/role/mumble.pp
@@ -1,3 +1,3 @@
-class nodo::role::mumble inherits nodo::vserver {
+class nodo::role::mumble inherits nodo::base::vserver {
   include mumble::ssl
 }
diff --git a/manifests/role/nas/plug.pp b/manifests/role/nas/plug.pp
index 4afb8aa..a092719 100644
--- a/manifests/role/nas/plug.pp
+++ b/manifests/role/nas/plug.pp
@@ -1,3 +1,3 @@
-class nodo::role::nas::plug inherits nodo::plug {
+class nodo::role::nas::plug inherits nodo::base::plug {
   include nodo::role::nas
 }
diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index 821e975..7852bef 100644
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -1,3 +1,3 @@
-class nodo::role::proxy inherits nodo::vserver {
+class nodo::role::proxy inherits nodo::base::vserver {
   include nginx
 }
diff --git a/manifests/role/router.pp b/manifests/role/router.pp
index 068837d..9d04813 100644
--- a/manifests/role/router.pp
+++ b/manifests/role/router.pp
@@ -1,4 +1,4 @@
-class nodo::role::router inherits nodo::appliance {
+class nodo::role::router inherits nodo::base::appliance {
   # We use monitor class on the router as the DNS server might by
   # inside a vserver and thus cannot access the network devices directly
   include nodo::utils::dns
diff --git a/manifests/role/server.pp b/manifests/role/server.pp
index 9eac72c..9bb95b2 100644
--- a/manifests/role/server.pp
+++ b/manifests/role/server.pp
@@ -1,3 +1,3 @@
 # A general purpose server
-class nodo::role::server inherits nodo::server {
+class nodo::role::server inherits nodo::base::server {
 }
diff --git a/manifests/role/storage.pp b/manifests/role/storage.pp
index 0cf7f60..144c367 100644
--- a/manifests/role/storage.pp
+++ b/manifests/role/storage.pp
@@ -1,3 +1,3 @@
-class nodo::role::storage inherits nodo::vserver {
+class nodo::role::storage inherits nodo::base::vserver {
   include nodo::utils::storage
 }
diff --git a/manifests/role/test.pp b/manifests/role/test.pp
index 330a5ee..035d42c 100644
--- a/manifests/role/test.pp
+++ b/manifests/role/test.pp
@@ -1,3 +1,3 @@
-class nodo::role::test inherits nodo::web {
+class nodo::role::test inherits nodo::role::web {
   # Class for test nodes
 }
diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp
index 2d5ff58..35da3b5 100644
--- a/manifests/role/tor.pp
+++ b/manifests/role/tor.pp
@@ -1,4 +1,4 @@
-class nodo::role::tor inherits nodo::vserver {
+class nodo::role::tor inherits nodo::base::vserver {
   include tor::daemon
   include nodo::utils::tor
 }
diff --git a/manifests/role/vserver.pp b/manifests/role/vserver.pp
index 55a754d..0d8a364 100644
--- a/manifests/role/vserver.pp
+++ b/manifests/role/vserver.pp
@@ -1,3 +1,3 @@
 # A general purpose vserver
-class nodo::role::vserver inherits nodo::vserver {
+class nodo::role::vserver inherits nodo::base::vserver {
 }
diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index 4b58ca9..954d391 100644
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -1,4 +1,4 @@
-class nodo::role::web inherits nodo::vserver {
+class nodo::role::web inherits nodo::base::vserver {
   # Hidden services
   $hidden = hiera('apache::site::hidden', false)
   if $hidden == true {
diff --git a/manifests/role/webdev/desktop.pp b/manifests/role/webdev/desktop.pp
index 063140a..017a339 100644
--- a/manifests/role/webdev/desktop.pp
+++ b/manifests/role/webdev/desktop.pp
@@ -1,3 +1,3 @@
-class nodo::role::webdev::desktop inherits nodo::desktop {
+class nodo::role::webdev::desktop inherits nodo::base::desktop {
   include nodo::role::webdev
 }
diff --git a/manifests/role/webdev/laptop.pp b/manifests/role/webdev/laptop.pp
index e9c1aab..a33a508 100644
--- a/manifests/role/webdev/laptop.pp
+++ b/manifests/role/webdev/laptop.pp
@@ -1,3 +1,3 @@
-class nodo::role::webdev::laptop inherits nodo::laptop {
+class nodo::role::webdev::laptop inherits nodo::base::laptop {
   include nodo::role::webdev
 }
diff --git a/manifests/role/yacy.pp b/manifests/role/yacy.pp
index 379297c..dc3480e 100644
--- a/manifests/role/yacy.pp
+++ b/manifests/role/yacy.pp
@@ -1,4 +1,4 @@
-class nodo::role::yacy inherits nodo::vserver {
+class nodo::role::yacy inherits nodo::base::vserver {
   class { 'onion': }
 
   package { 'yacy':
diff --git a/manifests/server.pp b/manifests/server.pp
deleted file mode 100644
index 6606a49..0000000
--- a/manifests/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class nodo::server inherits nodo::physical {
-  class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
-    type => 'server',
-  }
-}
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
deleted file mode 100644
index 030803f..0000000
--- a/manifests/vserver.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-class nodo::vserver {
-  class { 'timezone': }
-  class { 'syslog-ng::vserver': }
-
-  backupninja::sys { "sys":
-    ensure     => present,
-    partitions => false,
-    hardware   => false,
-    dosfdisk   => false,
-    dohwinfo   => false,
-  }
-
-  $hosting_type = hiera('nodo::vserver::hosting_type', 'direct')
-
-  case $hosting_type {
-    "direct": {
-      # Apply munin and monkeysphere configuration for
-      # for directly hosted nodes.
-      Munin_node        <<| title == $::hostname |>>
-      Monkeysphere_host <<| title == $::hostname |>>
-    }
-    "third-party": {
-      # Apply munin and monkeysphere configuration for
-      # nodes hosted by third-parties.
-      munin_node { "${::hostname}": }
-      monkeysphere_host { "${::hostname}":
-        port => hiera('nodo::vserver::ssh_port', '22'),
-      }
-
-      # Nagios configuration
-      class { 'nodo::subsystem::monitor':
-        type       => 'vserver',
-        use_nagios => hiera('nodo::vserver::use_nagios', false),
-      }
-    }
-  }
-
-}
-- 
cgit v1.2.3