Introducing $puppetd_runinterval and $puppetmaster_port

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index c35410ac28873648062f16c9626f234a6d4c06f6..5950433c9f836682dcc46e7fac26c4110b24c5ef 100644 (file)
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -1,6 +1,14 @@
 # handles puppetd service
 class puppetd inherits puppet {
 
+  case $puppetmaster_port {
+    '': { $puppetmaster_port = "8140" }
+  }
+
+  case $puppetd_runinterval {
+    '': { $puppetd_runinterval = "1800" }
+  }
+
   package { "puppet":
    ensure  => installed,
    require => Package["cron"],

diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index bddda72a7e9981da0364d6de1b33d29097deae79..96890c462a07dc390e19927c706638c5dd2fc6da 100644 (file)
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -8,5 +8,6 @@ pluginsync=true
 
 [puppetd]
 server = puppet.<%= domain %>
-runinterval = 1800
+runinterval = <%= puppetd_runinterval %>
 puppetport = 8139
+masterport = <%= puppetmaster_port %>