summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-17 16:50:26 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-17 16:50:26 -0200
commitc4e6d980566e4902b25ca40f0d56772f491cd686 (patch)
treec2b02e6f0287cf6f53399af8f9b2ed7d7496736e /manifests
parent2448fbb72c6caed419ea7ef0aab5505af2551f93 (diff)
downloadpuppet-puppet-c4e6d980566e4902b25ca40f0d56772f491cd686.tar.gz
puppet-puppet-c4e6d980566e4902b25ca40f0d56772f491cd686.tar.bz2
Adding support for mongrel
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppetmasterd.pp29
1 files changed, 28 insertions, 1 deletions
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index 2b7ace5..671d787 100644
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -1,5 +1,22 @@
# handles puppetmasterd service
class puppetmasterd {
+
+ # Configuration
+ case $puppetmaster_servertype {
+ '': {
+ $puppetmaster_servertype = 'mongrel'
+ $puppetmaster_daemon_opts = '--ssl_client_header=HTTP_X_SSL_SUBJECT'
+ }
+ }
+
+ case $puppetmaster_puppetmasters {
+ '': { $puppetmaster_puppetmasters = '4' }
+ }
+
+ case $puppetmaster_port {
+ '': { $puppetmaster_port = '18140' }
+ }
+
# warns that this node has a puppetmaster
$puppetmasterd_present = true
@@ -16,10 +33,20 @@ class puppetmasterd {
# for storeconfigs
include mysql::server
+ file { "/etc/default/puppetmaster":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0644,
+ content => template('puppet/puppetmaster.erb'),
+ notify => Service['puppetmaster'],
+ }
+
service { "puppetmaster":
enable => true,
ensure => running,
hasrestart => true,
+ require => Package['puppetmaster'],
}
# cron rule to update puppet config repository every 5 minutes
@@ -49,7 +76,7 @@ class puppetmasterd {
ensure => present,
}
- # TODO: database creation as suggested by
+ # Database creation as suggested by
# http://reductivelabs.com/trac/puppet/wiki/Recipes/MySQLStoredConfiguration
#exec { "create-storeconfigs-db":
# command => "/usr/bin/mysqladmin create puppet",