From 0d74b494453061e61bce4aa009c098a34bd10d77 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Jul 2011 10:52:51 -0300
Subject: Updating to recent monkeysphere module

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

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

diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
index 35983ca..6e021b6 100644
--- a/manifests/subsystems/monkeysphere.pp
+++ b/manifests/subsystems/monkeysphere.pp
@@ -1,12 +1,17 @@
 # Define a monkeysphere host
 define monkeysphere_host($port = '') {
-  # Monkeysphere
-  #
+  include monkeysphere
+
+  # Ensure the server's ssh key is imported into your monkeysphere key ring
+  monkeysphere::import_key { "ssh":
+    port => $port,
+  }
+
   # Currently we don't have a defined policy regarding whether
   # to publish all our node keys to public keyservers, so leave
   # automatic publishing disabled for now.
-  #
-  $monkeysphere_ssh_port    = $port
-  $monkeysphere_publish_key = 'mail'
-  include monkeysphere
+  #monkeysphere::publish_server_keys { } 
+  
+  # Email the server key
+  monkeysphere::email_server_keys { "root": }
 }
-- 
cgit v1.2.3