aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-07-14 10:52:51 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-07-14 10:52:51 -0300
commit0d74b494453061e61bce4aa009c098a34bd10d77 (patch)
tree6ecea7de043e21536f2b26a7e3dcd4ef35da0db5 /manifests/subsystems
parentf38ea60ab04e6bdbae3ab0a3b393e760592f58cd (diff)
downloadpuppet-nodo-0d74b494453061e61bce4aa009c098a34bd10d77.tar.gz
puppet-nodo-0d74b494453061e61bce4aa009c098a34bd10d77.tar.bz2
Updating to recent monkeysphere module
Diffstat (limited to 'manifests/subsystems')
-rw-r--r--manifests/subsystems/monkeysphere.pp17
1 files changed, 11 insertions, 6 deletions
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": }
}