Fix nodo::base::virtual inheritances

diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp
index 0cfe25f88b678d5ad026d3156a6aa6842f1c4f6e..a5261a3addae9fcebd16f311ccb0dd631d65e0a3 100644 (file)
--- a/manifests/role/bitcoin.pp
+++ b/manifests/role/bitcoin.pp
@@ -1,4 +1,4 @@
-class nodo::role::bitcoin inherits nodo::base::vserver {
+class nodo::role::bitcoin inherits nodo::base::virtual {
   include nodo::role::virtual
   include onion
   include onion::socks

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index 10aabb66a8cc4cb3647b3fdca034f6735218bd52..473e7a8d6feb832fd93879bd6afbc67ee8af487e 100644 (file)
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -1,4 +1,4 @@
-class nodo::role::dns inherits nodo::base::vserver {
+class nodo::role::dns inherits nodo::base::virtual {
   include bind
 
   # Put your custom DNS config in this class

diff --git a/manifests/role/jabber.pp b/manifests/role/jabber.pp
index c1d0494feb479958a0afbab4a29108e379712c39..1782fce615485b4af938b2c1176d674f80db756c 100644 (file)
--- a/manifests/role/jabber.pp
+++ b/manifests/role/jabber.pp
@@ -1,4 +1,4 @@
-class nodo::role::jabber inherits nodo::base::vserver {
+class nodo::role::jabber inherits nodo::base::virtual {
   include ssl
   include ejabberd
 

diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp
index c69d8f3f0d540d22a050e993d796c5a759684e27..42a2c3383a1f1bf007092ba4522c34d968727bd8 100644 (file)
--- a/manifests/role/mumble.pp
+++ b/manifests/role/mumble.pp
@@ -1,4 +1,4 @@
-class nodo::role::mumble inherits nodo::base::vserver {
+class nodo::role::mumble inherits nodo::base::virtual {
   include mumble::ssl
   include mumble::munin
 

diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index 9c6186da011333c9c1c3dc78dec8a9c2de569b1c..dc8edf07f7a9cfac07e7359082b7d89a55857570 100644 (file)
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -1,4 +1,4 @@
-class nodo::role::proxy inherits nodo::base::vserver {
+class nodo::role::proxy inherits nodo::base::virtual {
   class { 'nginx': }
 
   ssl::cert { "$::domain":

diff --git a/manifests/role/storage.pp b/manifests/role/storage.pp
index 144c36758c0de2751545bf8b5f9f4e036b69d14f..8711e449ab63e3a0414d76e96041135b52ed3290 100644 (file)
--- a/manifests/role/storage.pp
+++ b/manifests/role/storage.pp
@@ -1,3 +1,3 @@
-class nodo::role::storage inherits nodo::base::vserver {
+class nodo::role::storage inherits nodo::base::virtual {
   include nodo::utils::storage
 }

diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp
index 35da3b56f4373f05dc84a2cd70f509a53788e2fd..07ae5a0f9202c2f3d45a6b5c8342b4b95e558b1e 100644 (file)
--- a/manifests/role/tor.pp
+++ b/manifests/role/tor.pp
@@ -1,4 +1,4 @@
-class nodo::role::tor inherits nodo::base::vserver {
+class nodo::role::tor inherits nodo::base::virtual {
   include tor::daemon
   include nodo::utils::tor
 }

diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index bf03860846f8c519f37a3e488078da07f15072d6..3c0355f11174dd749046f7ddce7326fb3fe75e55 100644 (file)
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -1,4 +1,4 @@
-class nodo::role::web inherits nodo::base::vserver {
+class nodo::role::web inherits nodo::base::virtual {
   # Hidden services
   $hidden = hiera('apache::site::hidden', false)
   if $hidden == true {

diff --git a/manifests/role/yacy.pp b/manifests/role/yacy.pp
index e1fa6edc7c1e2bbf00429719c6d727fea85db086..d047c83b54e8f873659510d319a35bec0860416d 100644 (file)
--- a/manifests/role/yacy.pp
+++ b/manifests/role/yacy.pp
@@ -1,4 +1,4 @@
-class nodo::role::yacy inherits nodo::base::vserver {
+class nodo::role::yacy inherits nodo::base::virtual {
   class { 'onion': }
 
   package { 'yacy':