summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetd.pp8
-rw-r--r--templates/puppet-node.conf.erb3
2 files changed, 10 insertions, 1 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index c35410a..5950433 100644
--- 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 bddda72..96890c4 100644
--- 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 %>