Virtual fixes

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

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 0f5ba040e0799c641987376d4e6dcd9f8d1d7522..2383ada4aafedc9d877c5d6975163f3dd71e9253 100644 (file)
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,5 +1,5 @@
 class nodo::role::mail {
-  class { [ 'nodo::role::vserver', 'mail::system' ]: }
+  class { [ 'nodo::role::virtual', 'mail::system' ]: }
 
   # Config parameters
   $delivery = hiera('nodo::subsystem::mail::delivery', 'exim')

diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index fb77bcb54b1780ffb1755de52f578401a82948d7..5b6bfcfbd5a3ded101e071d6678b5e3f31805dee 100644 (file)
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -7,7 +7,7 @@ class nodo::role::master {
   }
 
   if $main == true {
-    # Puppetmaster should be included before nodo::vserver
+    # Puppetmaster should be included before nodo::virtual
     class { 'puppet::master':
       main => true,
     }
@@ -40,7 +40,7 @@ class nodo::role::master {
   }
 
   # These should be included after puppetmaster
-  include nodo::role::vserver
+  include nodo::role::virtual
   include database
   include git::daemon
   include nagios::headless

diff --git a/manifests/subsystem/monitor/munin.pp b/manifests/subsystem/monitor/munin.pp
index aa70c2fd865dd9e65ea930955d3909829bd0acfd..a3deb47ab6615c3cfc22317b4b22f9942f322ce0 100644 (file)
--- a/manifests/subsystem/monitor/munin.pp
+++ b/manifests/subsystem/monitor/munin.pp
@@ -1,5 +1,5 @@
 # Define a munin node
-define nodo::sybsystem::monitor::munin(
+define nodo::subsystem::monitor::munin(
   $port          = hiera('nodo::munin_node::port',   '4949'),
   $allow         = hiera('nodo::munin_node::allow',  ''),
   $host          = hiera('nodo::munin_node::host',    $::fqdn),