Updating to recent monkeysphere module

diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
index 35983ca9ffc77128f0a1ff642e13d8ceaf52294e..6e021b6e77789ba0ba279b7e331bcb1dc7c8d6e3 100644 (file)
--- 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": }
 }