]> gitweb.fluxo.info Git - puppet-nginx.git/commitdiff
Using hiera for puppetmaster config
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Jan 2013 12:51:04 +0000 (10:51 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Jan 2013 12:51:04 +0000 (10:51 -0200)
manifests/puppetmaster.pp

index 223a36c6c302b044d4424bc4e3d3a17f78cfdf0b..a04007b6eb81d74302b7e25c273e6f426a952847 100644 (file)
@@ -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