From fca49ede942b3dac87ad96e5a07b4fd0f299c4b9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 10:51:04 -0200
Subject: Using hiera for puppetmaster config

---
 manifests/puppetmaster.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'manifests')

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
-- 
cgit v1.2.3