aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/physical.pp9
-rw-r--r--manifests/plug.pp9
-rw-r--r--manifests/subsystems/monkeysphere.pp10
3 files changed, 12 insertions, 16 deletions
diff --git a/manifests/physical.pp b/manifests/physical.pp
index 97e55d3..229072d 100644
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -9,6 +9,7 @@ class nodo::physical inherits nodo {
include utils::physical
include smartmontools
include resolver
+ include monkeysphere_nodo
# Vserver configuration
$vserver_vdirbase = "/var/vservers"
@@ -44,14 +45,6 @@ class nodo::physical inherits nodo {
port => '4900',
}
- # Monkeysphere configuration
- monkeysphere_host { "$hostname":
- port => $monkeysphere_ssh_port ? {
- false => '',
- default => $monkeysphere_ssh_port,
- }
- }
-
# SMART monitoring
include munin::plugins::smart
munin::plugin { "smart_sda":
diff --git a/manifests/plug.pp b/manifests/plug.pp
index 4c5d859..99bde89 100644
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -6,19 +6,12 @@ class nodo::plug inherits nodo {
include firewall
include sysctl
include resolver
+ include monkeysphere_nodo
backupninja::sys { "sys":
ensure => present,
}
- # Monkeysphere configuration
- monkeysphere_host { "$hostname":
- port => $monkeysphere_ssh_port ? {
- false => '',
- default => $monkeysphere_ssh_port,
- }
- }
-
# Munin configuration
munin_node { "$hostname":
port => '4900',
diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
index d34a893..8cff4ce 100644
--- a/manifests/subsystems/monkeysphere.pp
+++ b/manifests/subsystems/monkeysphere.pp
@@ -16,3 +16,13 @@ define monkeysphere_host($port = '') {
# Email the server key
monkeysphere::email_server_keys { "root": }
}
+
+class monkeysphere_nodo {
+ # Monkeysphere configuration
+ monkeysphere_host { "$hostname":
+ port => $monkeysphere_ssh_port ? {
+ false => '',
+ default => $monkeysphere_ssh_port,
+ }
+ }
+}