Using hiera for mongrel config

diff --git a/manifests/master/mongrel.pp b/manifests/master/mongrel.pp
index 4a7708d536485fb7ed7dd6cc5d07fac3abf71b3d..987c33383b6913be78ffb0f4d6ac23e525c4771f 100644 (file)
--- a/manifests/master/mongrel.pp
+++ b/manifests/master/mongrel.pp
@@ -1,14 +1,6 @@
 # handles puppetmasterd service
 class puppet::master::mongrel {
 
-  case $puppetmaster_puppetmasters {
-    '': { $puppetmaster_puppetmasters = '4' }
-  }
-
-  case $puppetmaster_port {
-    '': { $puppetmaster_port = '18140' }
-  }
-
   # Include nginx
   include nginx::puppetmaster
 
@@ -31,7 +23,7 @@ class puppet::master::mongrel {
   # restart the master from time to time to avoid memory problems
   # thanks to https://labs.riseup.net/code/projects/shared-puppet
   file { "/etc/cron.d/puppetmaster":
-    source => "puppet://$server/modules/puppet/cron.d/puppetmaster",
+    source => "puppet:///modules/puppet/cron.d/puppetmaster",
     owner  => root,
     group  => root,
     mode   => 0644;

diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index 96fdb68ba14505b54d74fe0f668d87e56ea9421c..db7378330f0712eaa42f2a09c8b930a1af7ea88b 100644 (file)
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -46,6 +46,9 @@ class puppetmasterd(
   }
 
   case $puppetmaster_servertype {
+    $puppetmaster_puppetmasters = hiera('puppet::master::worker_processes', 4)
+    $puppetmaster_port          = hiera('puppet::master::port', '18140')
+
     'mongrel': {
       include puppet::master::mongrel
     }