summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 10:51:04 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 10:51:04 -0200
commitfca49ede942b3dac87ad96e5a07b4fd0f299c4b9 (patch)
tree0a227338df323c7b4bdb4380c8c39d732fee141b
parent8187c75a12fbe3f35fd3abdabf4c1ee82d1825f8 (diff)
downloadpuppet-nginx-fca49ede942b3dac87ad96e5a07b4fd0f299c4b9.tar.gz
puppet-nginx-fca49ede942b3dac87ad96e5a07b4fd0f299c4b9.tar.bz2
Using hiera for puppetmaster config
-rw-r--r--manifests/puppetmaster.pp10
1 files changed, 2 insertions, 8 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 223a36c..a04007b 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -1,13 +1,7 @@
class nginx::puppetmaster inherits nginx::base {
- $worker_processes = $puppetmaster_puppetmasters ? {
- '' => 4,
- default => $puppetmaster_puppetmasters,
- }
-
- case $puppetmaster_certname {
- '': { $puppetmaster_certname = "puppet.$domain" }
- }
+ $worker_processes = hiera('puppet::master::worker_processes', 4)
+ $puppetmaster_certname = hiera('puppet::master::certname', "puppet.${::domain}")
$worker_connections = 1024
$ssl_port = 8140