tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deprecated puppet::server class and added puppet::server::mongrel and puppet::server::apache classes.

Browse source
This commit is contained in:
Timo Mkinen 2011-04-07 14:13:10 +03:00
parent a8b57d1569
commit 0706169f50
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
puppet/manifests/init.pp
View file

@ -133,7 +133,12 @@ class puppet::manual inherits puppet::client {
} }
# Install and configure Puppet server class puppet::server {
fail("puppet::server class is deprecated, use puppet::server::mongrel or puppet::server::apache instead")
}
# Install and configure Puppet server using mongrel.
# #
# === Global variables # === Global variables
# #
@ -148,7 +153,7 @@ class puppet::manual inherits puppet::client {
# $puppet_report_maxage: # $puppet_report_maxage:
# Maximum age (in hours) to keep reports. Defaults to 720 hours (30 days). # Maximum age (in hours) to keep reports. Defaults to 720 hours (30 days).
# #
class puppet::server inherits puppet::client { class puppet::server::mongrel inherits puppet::client {
if ! $puppet_listenports { if ! $puppet_listenports {
$puppet_listenports = [ "18140", "18141", "18142", "18143", ] $puppet_listenports = [ "18140", "18141", "18142", "18143", ]
@ -183,21 +188,6 @@ class puppet::server inherits puppet::client {
before => File["/etc/puppet/puppet.conf"], before => File["/etc/puppet/puppet.conf"],
} }
include apache::sslserver
apache::configfile { "puppet.conf":
content => template("puppet/puppet-httpd.conf.erb"),
http => false,
require => Service["puppetmaster"],
}
case $operatingsystem {
debian,ubuntu: {
include apache::mod::headers
include apache::mod::proxy
include apache::mod::proxy_http
include apache::mod::proxy_balancer
}
}
include mongrel include mongrel
include ldap::client::ruby include ldap::client::ruby
@ -361,6 +351,28 @@ class puppet::server inherits puppet::client {
} }
# Install and configure Puppet server using apache as proxy server.
#
class puppet::server::apache inherits puppet::server::mongrel {
include apache::sslserver
apache::configfile { "puppet.conf":
content => template("puppet/puppet-httpd.conf.erb"),
http => false,
require => Service["puppetmaster"],
}
case $operatingsystem {
debian,ubuntu: {
include apache::mod::headers
include apache::mod::proxy
include apache::mod::proxy_http
include apache::mod::proxy_balancer
}
}
}
# Install and configure opencollab-puppet-uploader. # Install and configure opencollab-puppet-uploader.
# #
# === Global variables # === Global variables