From ad27f5dac1870369abe10e88fbb034ffa391f12c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Jan 2013 13:18:39 -0200
Subject: Lots of subsystem refactoring; minor node changes

---
 manifests/subsystems/monkeysphere.pp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'manifests/subsystems/monkeysphere.pp')

diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
index 8c35d13..3b55d6f 100644
--- a/manifests/subsystems/monkeysphere.pp
+++ b/manifests/subsystems/monkeysphere.pp
@@ -1,5 +1,8 @@
 # Define a monkeysphere host
-define monkeysphere_host($port = '') {
+define monkeysphere_host(
+  $port           = hiera('nodo::monkeysphere_host::ssh_port', ''),
+  $mail_recipient = hiera('nodo::root_mail_recipient', 'nobody')
+) {
   include monkeysphere
 
   # Ensure the server's ssh key is imported into your monkeysphere key ring
@@ -14,15 +17,5 @@ define monkeysphere_host($port = '') {
   #monkeysphere::publish_server_keys { } 
   
   # Email the server key
-  monkeysphere::email_server_keys { "$root_mail_recipient": }
-}
-
-class monkeysphere_nodo {
-  # Monkeysphere configuration
-  monkeysphere_host { "$hostname":
-    port => $monkeysphere_ssh_port ? {
-      false   => '',
-      default => $monkeysphere_ssh_port,
-    }
-  }
+  monkeysphere::email_server_keys { "$mail_recipient": }
 }
-- 
cgit v1.2.3