diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-06-03 14:34:14 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-06-03 14:34:14 -0300 |
| commit | 87f3c8f5ceb42aef1f589639fc4d15ad675136b9 (patch) | |
| tree | edb509f574f792d811896b21099e60982d92d968 | |
| parent | 263c720bbc1d08638e3c78806e44f7adf7978e14 (diff) | |
| download | puppet-puppet-87f3c8f5ceb42aef1f589639fc4d15ad675136b9.tar.gz puppet-puppet-87f3c8f5ceb42aef1f589639fc4d15ad675136b9.tar.bz2 | |
Introducing $puppetd_runinterval and $puppetmaster_port
| -rw-r--r-- | manifests/puppetd.pp | 8 | ||||
| -rw-r--r-- | templates/puppet-node.conf.erb | 3 |
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 %> |