21 files changed, 21 insertions, 21 deletions
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':