Monkeysphere with ssh port

4 files changed, 27 insertions, 12 deletions

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 75c472b..f7741a4 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -20,15 +20,6 @@ class nodo {
   $ntp_pool     = "south-america.pool.ntp.org"
   $ntp_servers  = [ 'a.ntp.br', 'b.ntp.br', 'c.ntp.br' ]
 
-  # Monkeysphere
-  #
-  # 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_publish_key = false
-  include monkeysphere
-
   # Email delivery configuration
   case $mail_delivery {
     'tunnel': {              
diff --git a/manifests/physical.pp b/manifests/physical.pp
index a16f64a..dfb32b4 100644
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -48,6 +48,9 @@ class nodo::physical inherits nodo {
     port => '4900',
   }
 
+  # Monkeysphere configuration
+  monkeysphere_host { "$hostname": }
+
   # SMART monitoring
   include munin::plugins::smart
   munin::plugin { "smart_sda":
diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
new file mode 100644
index 0000000..35983ca
--- /dev/null
+++ b/manifests/subsystems/monkeysphere.pp
@@ -0,0 +1,12 @@
+# Define a monkeysphere host
+define monkeysphere_host($port = '') {
+  # Monkeysphere
+  #
+  # 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
+}
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index c50fa47..57eb763 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -18,14 +18,18 @@ class nodo::vserver inherits nodo {
 
   case $hosting_type {
     "direct": {
-      # Apply munin configuration for this node for
-      # directly hosted nodes.
-      Munin_node <<| title == $hostname |>>
+      # Apply munin and monkeysphere configuration for
+      # for directly hosted nodes.
+      Munin_node        <<| title == $hostname |>>
+      Monkeysphere_host <<| title == $hostname |>>
     }
     "third-party": {
       # Apply munin configuration for this node for third-party
       # hosted nodes.
       munin_node { "$hostname": }
+      monkeysphere_node { "$hostname":
+        $port => $node_ssh_port,
+      }
     }
   }
 
@@ -80,6 +84,11 @@ class nodo::vserver inherits nodo {
       port => "49$id",
     }
 
+    # Create a monkeysphere virtual resource to be realized in the node
+    @@monkeysphere_host { "$name":
+      port => "22$id",
+    }
+
     # Sound support
     if $sound {
       if !defined(File["/usr/local/sbin/create-sound-devices"]) {