From 1564ca8593730f0cd5f4d69dcf5a860f73efccb4 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 11 Sep 2015 22:02:36 -0300
Subject: Rename vserver to virtual

---
 manifests/base/virtual.pp | 35 +++++++++++++++++++++++++++++++++++
 manifests/base/vserver.pp | 35 -----------------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 manifests/base/virtual.pp
 delete mode 100644 manifests/base/vserver.pp

(limited to 'manifests/base')

diff --git a/manifests/base/virtual.pp b/manifests/base/virtual.pp
new file mode 100644
index 0000000..7852d79
--- /dev/null
+++ b/manifests/base/virtual.pp
@@ -0,0 +1,35 @@
+class nodo::base::virtual {
+  class { 'ntp::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.
+      Nodo::Subsystem::Monitor::Munin <<| title == $::hostname |>>
+      Nodo::Subsystem::Monkeysphere   <<| title == $::hostname |>>
+    }
+    "third-party": {
+      # Apply munin and monkeysphere configuration for
+      # nodes hosted by third-parties.
+      nodo::subsystem::monitor::munin { "${::hostname}": }
+      monkeysphere_host { "${::hostname}":
+        port => hiera('nodo::vserver::ssh_port', '22'),
+      }
+
+      # Nagios configuration
+      class { 'nodo::subsystem::monitor': }
+    }
+  }
+
+}
diff --git a/manifests/base/vserver.pp b/manifests/base/vserver.pp
deleted file mode 100644
index f904f32..0000000
--- a/manifests/base/vserver.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class nodo::base::vserver {
-  class { 'ntp::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.
-      Nodo::Subsystem::Monitor::Munin <<| title == $::hostname |>>
-      Nodo::Subsystem::Monkeysphere   <<| title == $::hostname |>>
-    }
-    "third-party": {
-      # Apply munin and monkeysphere configuration for
-      # nodes hosted by third-parties.
-      nodo::subsystem::monitor::munin { "${::hostname}": }
-      monkeysphere_host { "${::hostname}":
-        port => hiera('nodo::vserver::ssh_port', '22'),
-      }
-
-      # Nagios configuration
-      class { 'nodo::subsystem::monitor': }
-    }
-  }
-
-}
-- 
cgit v1.2.3