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

Fixed Apache module for Fedora 18 (eg. Apache 2.4 series).

Browse source
This commit is contained in:
Timo Mkinen 2013-04-24 08:44:19 +03:00
parent f1d7f518d1
commit 7bd26f33d3
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apache/files/emptysite/00-dummy.conf Normal file
View file

@ -0,0 +1 @@

4
apache/manifests/redhat.pp
View file

@ -109,7 +109,7 @@ define apache::redhat::site($aliases, $root, $redirect) {
force => true, force => true,
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sites/${site_fqdn}", source => [ "puppet:///files/apache/sites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/apache/emptysite", ],
before => File[$site_conf], before => File[$site_conf],
notify => Service["httpd"], notify => Service["httpd"],
} }
@ -322,7 +322,7 @@ define apache::redhat::sslsite($first, $ipaddr, $root,
force => true, force => true,
recurse => true, recurse => true,
source => [ "puppet:///files/apache/sslsites/${site_fqdn}", source => [ "puppet:///files/apache/sslsites/${site_fqdn}",
"puppet:///modules/custom/empty", ], "puppet:///modules/apache/emptysite", ],
before => File[$site_conf], before => File[$site_conf],
notify => Service["httpsd"], notify => Service["httpsd"],
} }

2
apache/templates/site.http.conf.erb
View file

@ -6,5 +6,5 @@
ErrorLog /srv/www/log/http/<%= site_fqdn %>/error_log ErrorLog /srv/www/log/http/<%= site_fqdn %>/error_log
CustomLog /srv/www/log/http/<%= site_fqdn %>/access_log combined CustomLog /srv/www/log/http/<%= site_fqdn %>/access_log combined
DocumentRoot /srv/www/http/<%= site_fqdn %> DocumentRoot /srv/www/http/<%= site_fqdn %>
Include <%= site_confdir %> Include <%= site_confdir %>/*.conf
</VirtualHost> </VirtualHost>

2
apache/templates/site.https.conf.erb
View file

@ -149,6 +149,6 @@ BrowserMatch "MSIE [2-5]" \
#CustomLog logs/ssl_request_log \ #CustomLog logs/ssl_request_log \
# "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" # "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
Include <%= site_confdir %> Include <%= site_confdir %>/*.conf
</VirtualHost> </VirtualHost>