From a9bf97764205b57275d52075803222d445ea3ff2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 27 Mar 2012 13:55:32 +0200 Subject: Modernize sample apache2 site snippets. --- apache2/sites-available/lists.secure-example.com | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'apache2/sites-available/lists.secure-example.com') diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com index 48e9d84..45f2fc4 100644 --- a/apache2/sites-available/lists.secure-example.com +++ b/apache2/sites-available/lists.secure-example.com @@ -1,52 +1,52 @@ - ServerName lists.example.com:443 - ServerAlias lists - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/lists.example.com/ + ServerName lists.example.com:443 + ServerAlias lists + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/lists.example.com/ - Include /etc/apache2/conf.d/local-ssl.conf - Include /etc/apache2/conf.d/local-log-vhosts.conf + Include conf.d/local-ssl.conf + Include conf.d/local-log-vhosts.conf - Alias /pipermail /var/lib/mailman/archives/public - Alias /images/mailman /usr/share/images/mailman - ScriptAlias /mailman /usr/lib/cgi-bin/mailman + Alias /pipermail /var/lib/mailman/archives/public + Alias /images/mailman /usr/share/images/mailman + ScriptAlias /mailman /usr/lib/cgi-bin/mailman - RewriteEngine On - RewriteRule ^/$ /mailman/listinfo [R] - RewriteRule ^/mailman(/)?$ /mailman/listinfo [R] + RewriteEngine On + RewriteRule ^/$ /mailman/listinfo [R] + RewriteRule ^/mailman(/)?$ /mailman/listinfo [R] order deny,allow allow from all - CustomLog "| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger - ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" + ErrorLog ${APACHE_LOG_DIR}/lists.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/lists.example.com-access.log combined - ServerName www.lists.example.com:443 - ServerAlias *.lists.example.com:443 - ServerAdmin webmaster@example.com + ServerName www.lists.example.com:443 + ServerAlias *.lists.example.com:443 + ServerAdmin webmaster@example.com - Include /etc/apache2/conf.d/local-ssl.conf - Include /etc/apache2/conf.d/local-log-origin.conf + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf - RewriteEngine On - RewriteRule / https://lists.example.com/ [R] -# RewriteRule /(.*) https://lists.example.com/$1 [R] + RewriteEngine On + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] - CustomLog /var/log/apache2/redirect.log origin + CustomLog ${APACHE_LOG_DIR}/redirect.log origin - ServerName lists.example.com - ServerAlias *.lists.example.com - ServerAdmin webmaster@example.com + ServerName lists.example.com + ServerAlias *.lists.example.com + ServerAdmin webmaster@example.com - Include /etc/apache2/conf.d/local-log-origin.conf + Include conf.d/local-log-origin.conf - RewriteEngine On - RewriteRule / https://lists.example.com/ [R] -# RewriteRule /(.*) https://lists.example.com/$1 [R] + RewriteEngine On + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] - CustomLog /var/log/apache2/redirect.log origin + CustomLog ${APACHE_LOG_DIR}/redirect.log origin -- cgit v1.2.3