Improved apache virtual host configuration

Additional configuration files are now fetched from the puppet file server.
2010-11-05 16:55:08 +02:00 · 2010-11-05 16:55:08 +02:00 · 63440a18d4
commit 63440a18d4
parent eca8e074e5
5 changed files with 76 additions and 49 deletions
--- a/apache/templates/site.http.conf.erb
+++ b/apache/templates/site.http.conf.erb
@ -6,4 +6,5 @@
  ErrorLog /srv/www/log/http/<%= site_fqdn %>/error_log
  CustomLog /srv/www/log/http/<%= site_fqdn %>/access_log combined
  DocumentRoot /srv/www/http/<%= site_fqdn %>
+  Include <%= site_confdir %>
 </VirtualHost>
--- a/apache/templates/site.https.conf.erb
+++ b/apache/templates/site.https.conf.erb
@ -234,5 +234,7 @@ SetEnvIf User-Agent ".*MSIE.*" \
 #CustomLog logs/ssl_request_log \
 #          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"

+Include <%= site_confdir %>
+
 </VirtualHost>