aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-03 17:02:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-03 17:02:34 -0300
commite40534a0dbd2d79a888ac97935dfba7161d8fbc4 (patch)
tree09199a6b400345c1094fb17dc054f625b6b6b2c9
parent2748e95e9e08b56ab59a3f082896121637b3f0df (diff)
downloadpuppet-nodo-e40534a0dbd2d79a888ac97935dfba7161d8fbc4.tar.gz
puppet-nodo-e40534a0dbd2d79a888ac97935dfba7161d8fbc4.tar.bz2
Fix at puppetmaster ports on nodo::vserver::instance
-rw-r--r--manifests/vserver.pp18
1 files changed, 10 insertions, 8 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 17be6c3..d27b4f4 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -3,14 +3,6 @@ class nodo::vserver inherits nodo {
include timezone
include syslog-ng::vserver
- case $puppetmaster_port {
- '': { $puppetmaster_port = "8140" }
- }
-
- case $puppetmaster_nonssl_port {
- '': { $puppetmaster_nonssl_port = "8141" }
- }
-
backupninja::sys { "sys":
ensure => present,
partitions => false,
@@ -50,6 +42,16 @@ class nodo::vserver inherits nodo {
$id = $context
}
+ # set puppetmaster ssl port
+ case $puppetmaster_port {
+ '': { $puppetmaster_port = "8140" }
+ }
+
+ # set puppetmaster non-ssl port
+ case $puppetmaster_nonssl_port {
+ '': { $puppetmaster_nonssl_port = "8141" }
+ }
+
vserver { $name:
ensure => $ensure,
context => "$context",