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

apache: Combined proxy.http.conf.erb to site.http.conf.erb.

Browse source
This commit is contained in:
Timo Mkinen 2013-09-24 11:21:29 +03:00
parent 165ec9cbe4
commit 6cebef3715
4 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

32
apache/manifests/redhat.pp
View file

@ -57,7 +57,7 @@ define apache::redhat::site($aliases, $root, $redirect, $proxy) {
$site_confdir = "/etc/httpd/site.http.d/${site_fqdn}.d"
if !$redirect {
if !$proxy {
if $proxy == "" {
if $root {
file { "/srv/www/http/${site_fqdn}":
ensure => link,
@ -98,26 +98,24 @@ define apache::redhat::site($aliases, $root, $redirect, $proxy) {
File[$site_conf] {
content => "<VirtualHost *:80>\n ServerName ${site_fqdn}\n Redirect permanent / ${redirect}\n</VirtualHost>\n",
}
} elsif $proxy {
File[$site_conf] {
content => template("apache/proxy.http.conf.erb"),
}
} else {
File[$site_conf] {
content => template("apache/site.http.conf.erb"),
}
file { $site_confdir:
ensure => directory,
mode => "0644",
owner => root,
group => root,
purge => true,
force => true,
recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/apache/emptysite", ],
before => File[$site_conf],
notify => Service["httpd"],
if $proxy == "" {
file { $site_confdir:
ensure => directory,
mode => "0644",
owner => "root",
group => "root",
purge => true,
force => true,
recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/apache/emptysite", ],
before => File[$site_conf],
notify => Service["httpd"],
}
}
}