aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/base/host.pp3
-rw-r--r--manifests/base/plug.pp3
-rw-r--r--manifests/base/raspberrypi.pp3
-rw-r--r--manifests/base/virtual.pp7
-rw-r--r--manifests/subsystem/monkeysphere.pp9
5 files changed, 14 insertions, 11 deletions
diff --git a/manifests/base/host.pp b/manifests/base/host.pp
index 148ebc8..5c3bba5 100644
--- 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 2ef9065..bc0cf27 100644
--- 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 cba616f..80faab3 100644
--- 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 0e107c0..5fbeb78 100644
--- 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 ab3bc18..cbe770e 100644
--- 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":