Fix: disable monkeysphere as it's currently not available

diff --git a/manifests/base/host.pp b/manifests/base/host.pp
index 148ebc8f23d4632d2b3a996fddd58764c025e785..5c3bba5e4d5180b6ede4ffc97b3ecf8ee41fbaa7 100644 (file)
--- a/manifests/base/host.pp
+++ b/manifests/base/host.pp
@@ -9,7 +9,8 @@ class nodo::base::host {
   include nodo::utils::physical
   include nodo::utils::storage::crypto
 
-  nodo::subsystem::monkeysphere { "${::hostname}": }
+  # Monkeysphere is currently unavailable
+  #nodo::subsystem::monkeysphere { "${::hostname}": }
 
   # Firewall
   class { 'firewall': }

diff --git a/manifests/base/plug.pp b/manifests/base/plug.pp
index 2ef90654b40b780d1fcb16f4cfd66c0cbc4f5ea7..bc0cf27c48a0da3ea03a78f6e3ad58ec93d8d397 100644 (file)
--- a/manifests/base/plug.pp
+++ b/manifests/base/plug.pp
@@ -4,7 +4,8 @@ class nodo::base::plug {
   include nodo::subsystem::sysctl
   include nodo::subsystem::resolver
 
-  nodo::subsystem::monkeysphere { "${::hostname}": }
+  # Monkeysphere is currently unavailable
+  #nodo::subsystem::monkeysphere { "${::hostname}": }
 
   class { [ 'ntp::ntpdate', 'firewall' ]: }
 

diff --git a/manifests/base/raspberrypi.pp b/manifests/base/raspberrypi.pp
index cba616fd28260162e92f245ef4ac2e76e2024378..80faab3013aaa20c8a45e78eb3d486841fbd12a3 100644 (file)
--- a/manifests/base/raspberrypi.pp
+++ b/manifests/base/raspberrypi.pp
@@ -2,7 +2,8 @@ class nodo::base::raspberrypi {
   include nodo::utils::physical
   include nodo::utils::storage::archive
 
-  nodo::subsystem::monkeysphere { "${::hostname}": }
+  # Monkeysphere is currently unavailable
+  #nodo::subsystem::monkeysphere { "${::hostname}": }
 
   class { [ 'firewall', 'ntp::ntpdate' ]: }
 

diff --git a/manifests/base/virtual.pp b/manifests/base/virtual.pp
index 0e107c0fb5a2d2c7274f4548df31b8cfc8ad6c71..5fbeb7804090d6d80001c99973cf203f539fde97 100644 (file)
--- a/manifests/base/virtual.pp
+++ b/manifests/base/virtual.pp
@@ -9,7 +9,8 @@ class nodo::base::virtual {
     dohwinfo   => false,
   }
 
-  nodo::subsystem::monkeysphere { "${::hostname}":
-    port => lookup('nodo::virtual::ssh_port', undef, undef, '22'),
-  }
+  # Monkeysphere is currently unavailable
+  #nodo::subsystem::monkeysphere { "${::hostname}":
+  #  port => lookup('nodo::virtual::ssh_port', undef, undef, '22'),
+  #}
 }

diff --git a/manifests/subsystem/monkeysphere.pp b/manifests/subsystem/monkeysphere.pp
index ab3bc18c91bfe50f5c0fe997adbdb2a49bccade0..cbe770e6b619e52ada82732fdd8ae5ede8f519e0 100644 (file)
--- a/manifests/subsystem/monkeysphere.pp
+++ b/manifests/subsystem/monkeysphere.pp
@@ -9,11 +9,10 @@ define nodo::subsystem::monkeysphere(
     port => $port,
   }
 
-  # TODO
-  # 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_server_keys { } 
+  # 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_server_keys { }
   
   # Email the server key
   monkeysphere::email_server_keys { "$mail_recipient":