From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 12 Sep 2015 01:17:43 +0000 (-0300)
Subject: Virtual fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9873d7f131b156c88ba6a87c45c0b911a0986dba;p=puppet-nodo.git

Virtual fixes
---

diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp
index e1e7e08..0cfe25f 100644
--- 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 0f5ba04..2383ada 100644
--- 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 fb77bcb..5b6bfcf 100644
--- 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 aa70c2f..a3deb47 100644
--- 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),