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

Fixed apache config on Debian/Ubuntu in puppet module

Browse source
This commit is contained in:
Ossi Salmi 2010-11-05 16:55:06 +02:00 • committed by Timo Mkinen
parent 42fd785e66
commit 1ebd8e7aff
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
puppet/manifests/init.pp
View file

@ -179,24 +179,20 @@ class puppet::server inherits puppet::client {
before => File["/etc/puppet/puppet.conf"], before => File["/etc/puppet/puppet.conf"],
} }
case $operatingsystem { include apache::sslserver
debian,ubuntu: {
include apache::server
apache::a2enmod { "headers": }
apache::a2enmod { "proxy": }
apache::a2enmod { "proxy_balancer": }
apache::a2enmod { "proxy_http": }
apache::a2enmod { "ssl": }
}
default: {
include apache::sslserver
}
}
apache::configfile { "puppet.conf": apache::configfile { "puppet.conf":
content => template("puppet/puppet-httpd.conf.erb"), content => template("puppet/puppet-httpd.conf.erb"),
http => false, http => false,
require => Service["puppetmaster"], require => Service["puppetmaster"],
} }
case $operatingsystem {
debian,ubuntu: {
apache::debian::a2enmod { "headers": }
apache::debian::a2enmod { "proxy": }
apache::debian::a2enmod { "proxy_http": }
apache::debian::a2enmod { "proxy_balancer": }
}
}
include mongrel include mongrel
include ldap::client::ruby include ldap::client::ruby

6
puppet/templates/puppet-httpd.conf.erb
View file

@ -24,6 +24,12 @@ Listen 8140
<VirtualHost _default_:8140> <VirtualHost _default_:8140>
# Use separate log files for the SSL virtual host; note that LogLevel
# is not inherited from httpd.conf.
ErrorLog /srv/www/log/https/<%= fqdn %>/error_log
CustomLog /srv/www/log/https/<%= fqdn %>/access_log combined
LogLevel warn
# SSL Engine Switch: # SSL Engine Switch:
# Enable/Disable SSL for this virtual host. # Enable/Disable SSL for this virtual host.
SSLEngine on SSLEngine on