aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/host.pp4
-rw-r--r--manifests/plug.pp2
-rw-r--r--manifests/subsystems/monkeysphere.pp2
-rw-r--r--manifests/vserver.pp8
-rw-r--r--manifests/vserver/instance.pp2
5 files changed, 9 insertions, 9 deletions
diff --git a/manifests/host.pp b/manifests/host.pp
index ee6c18e..42e739d 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -6,10 +6,10 @@ class nodo::host inherits nodo {
include sysctl
include utils::physical
include resolver
-
- class { 'monkeysphere_host': }
class { 'syslog-ng': }
+ monkeysphere_host { "${::hostname}": }
+
# Firewall configuration
class { 'firewall': }
diff --git a/manifests/plug.pp b/manifests/plug.pp
index 630be3a..f5992fc 100644
--- a/manifests/plug.pp
+++ b/manifests/plug.pp
@@ -5,7 +5,7 @@ class nodo::plug inherits nodo {
include sysctl
include resolver
- class { 'monkeysphere_host': }
+ monkeysphere_host { "${::hostname}": }
class { 'firewall': }
diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp
index 54bf078..76530ca 100644
--- a/manifests/subsystems/monkeysphere.pp
+++ b/manifests/subsystems/monkeysphere.pp
@@ -1,4 +1,4 @@
-class monkeysphere_host(
+define monkeysphere_host(
$port = hiera('nodo::monkeysphere_host::ssh_port', ''),
$mail_recipient = hiera('nodo::root_mail_recipient', 'nobody')
) {
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 9feb030..b68d501 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -20,8 +20,8 @@ class nodo::vserver inherits nodo {
"direct": {
# Apply munin and monkeysphere configuration for
# for directly hosted nodes.
- Munin_node <<| title == $hostname |>>
- Monkeysphere_host <<| title == $hostname |>>
+ Munin_node <<| title == $::hostname |>>
+ Monkeysphere_host <<| title == $::hostname |>>
# Set proxy configuration
$nodo_https_proxy = 'yes'
@@ -29,8 +29,8 @@ class nodo::vserver inherits nodo {
"third-party": {
# Apply munin and monkeysphere configuration for
# nodes hosted by third-parties.
- munin_node { "$hostname": }
- monkeysphere_host { "$hostname":
+ munin_node { "${::hostname}": }
+ monkeysphere_host { "${::hostname}":
port => $node_ssh_port,
}
diff --git a/manifests/vserver/instance.pp b/manifests/vserver/instance.pp
index 90b0b0a..dba9abb 100644
--- a/manifests/vserver/instance.pp
+++ b/manifests/vserver/instance.pp
@@ -52,7 +52,7 @@ define nodo::vserver::instance($context, $ensure = 'running', $proxy = false,
}
# Create a munin virtual resource to be realized in the node
- @@munin_node { "$name":
+ @@munin_node { "${name}":
port => $munin_port ? {
false => "49$id",
default => $munin_port,