From 796bd7bd500b94316ca189a5aba773cd27b467dc Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Jan 2013 20:08:41 -0200
Subject: Refactoring hosting type

---
 manifests/vserver.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'manifests/vserver.pp')

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index b68d501..a889e9a 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -11,10 +11,7 @@ class nodo::vserver inherits nodo {
     dohwinfo   => false,
   }
 
-  $hosting_type = $node_hosting_type ? {
-    ''      => "direct",
-    default => "$node_hosting_type",
-  }
+  $hosting_type = hiera('nodo::vserver::hosting_type', 'direct')
 
   case $hosting_type {
     "direct": {
@@ -22,16 +19,13 @@ class nodo::vserver inherits nodo {
       # for directly hosted nodes.
       Munin_node        <<| title == $::hostname |>>
       Monkeysphere_host <<| title == $::hostname |>>
-
-      # Set proxy configuration
-      $nodo_https_proxy = 'yes'
     }
     "third-party": {
       # Apply munin and monkeysphere configuration for
       # nodes hosted by third-parties.
       munin_node { "${::hostname}": }
       monkeysphere_host { "${::hostname}":
-        port => $node_ssh_port,
+        port => hiera('nodo::vserver::ssh_port', '22'),
       }
 
       # Nagios configuration
-- 
cgit v1.2.3