Adjust log setup. Tighten spacing and indentation.

5 files changed, 41 insertions, 25 deletions

diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com
index 1c82dd7..48e9d84 100644
--- a/apache2/sites-available/lists.secure-example.com
+++ b/apache2/sites-available/lists.secure-example.com
@@ -5,6 +5,7 @@
 	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
 
 	Alias		/pipermail /var/lib/mailman/archives/public
 	Alias		/images/mailman /usr/share/images/mailman
@@ -19,7 +20,6 @@
 		allow from all
 	</Location>
 
-	Include		/etc/apache2/conf.d/local-log-vhosts.conf
 	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"
 </VirtualHost>
@@ -29,21 +29,24 @@
 	ServerAdmin	webmaster@example.com
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 	RewriteRule	/	https://lists.example.com/	[R]
 #	RewriteRule	/(.*)	https://lists.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	lists.example.com
 	ServerAlias	*.lists.example.com
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-log-origin.conf
+
 	RewriteEngine	On
 	RewriteRule	/	https://lists.example.com/	[R]
 #	RewriteRule	/(.*)	https://lists.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com
index bff57d4..b9dea83 100644
--- a/apache2/sites-available/mail.secure-example.com
+++ b/apache2/sites-available/mail.secure-example.com
@@ -1,15 +1,17 @@
 <VirtualHost *:443>
 	ServerName	mail.example.com:443
 	ServerAdmin	webmaster@example.com
+
 	DocumentRoot	/home/webmaster/public_websites/mail.example.com/
 
-	Include /etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/horde2.conf
 
-	Include /etc/apache2/conf.d/horde2.conf
 	<Location /horde2>
 		Options FollowSymLinks -MultiViews
 		DirectoryIndex index.php
 	</Location>
+
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	www.mail.example.com:443
@@ -18,12 +20,13 @@
 	ServerAlias	*.mail:443
 	ServerAdmin	webmaster@example.com
 
-	Include /etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 	RewriteRule	/ https://mail.example.com/ [R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	mail.example.com
@@ -32,8 +35,10 @@
 	ServerAlias	*.mail
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-log-origin.conf
+
 	RewriteEngine	On
 	RewriteRule	/ https://mail.example.com/ [R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
diff --git a/apache2/sites-available/users.secure-example.com b/apache2/sites-available/users.secure-example.com
index 5c1cd87..bd937b0 100644
--- a/apache2/sites-available/users.secure-example.com
+++ b/apache2/sites-available/users.secure-example.com
@@ -2,6 +2,7 @@
 	ServerName	users.example.com
 	ServerAlias	users
 	ServerAdmin	webmaster@example.com
+
 	DocumentRoot	/home/webmaster/public_websites/users.example.com/
 
 	Include		/etc/apache2/conf.d/local-userdir.conf
@@ -19,11 +20,13 @@
 	ServerAlias	*.users.example.com
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-log-origin.conf
+
 	RewriteEngine	On
 	RewriteRule	/	http://users.example.com/	[R]
 #	RewriteRule	/(.*)	http://users.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	users.example.com:443
@@ -33,10 +36,11 @@
 	ServerAdmin	webmaster@example.com
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 	RewriteRule	/	http://users.example.com/	[R]
 #	RewriteRule	/(.*)	http://users.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
index 04cf7e0..8ca2919 100644
--- a/apache2/sites-available/wiki.secure-example.com
+++ b/apache2/sites-available/wiki.secure-example.com
@@ -1,7 +1,8 @@
 <VirtualHost *:443>
-	ServerName wiki.example.com
-	ServerAdmin webmaster@example.com
-	DocumentRoot /usr/share/moin/htdocs
+	ServerName	wiki.example.com
+	ServerAdmin	webmaster@example.com
+
+	DocumentRoot	/usr/share/moin/htdocs
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
 
@@ -29,9 +30,7 @@
         AcceptPathInfo	On
 
 	RewriteEngine	On
-
 	RewriteLogLevel	1
-
 	RewriteRule	^/moin(/(.*))?	/$2							[last,R]
 	RewriteRule	^/wiki/		-							[last]
 	RewriteRule	^/robots.txt	-							[last]
@@ -42,9 +41,8 @@
 #	RewriteRule	^/?(.*)		/var/local/moin/server/moinmodpy.py$1			[last]
 #	RewriteRule	^/?(.*)		moin/$1			[last,type=application/x-python-code]
 
-	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	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	/var/log/apache2/wiki.example.com-error.log
+	CustomLog	/var/log/apache2/wiki.example.com-access.log combined
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	www.wiki.example.com:443
@@ -53,12 +51,13 @@
 	ServerAdmin	webmaster@example.com
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 #	RewriteRule	/	https://wiki.example.com/	[R]
 	RewriteRule	/(.*)?	https://wiki.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	wiki.example.com
@@ -67,9 +66,11 @@
 	ServerAlias	*.wiki
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-log-origin.conf
+
 	RewriteEngine	On
 #	RewriteRule	/	https://wiki.example.com/	[R]
 	RewriteRule	/(.*)?	https://wiki.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
diff --git a/apache2/sites-available/www.secure-example.com b/apache2/sites-available/www.secure-example.com
index 792905a..3842593 100644
--- a/apache2/sites-available/www.secure-example.com
+++ b/apache2/sites-available/www.secure-example.com
@@ -2,22 +2,24 @@
 	ServerName	www.example.com
 	ServerAlias	www
 	ServerAdmin	webmaster@example.com
+
 	DocumentRoot	/home/webmaster/public_websites/www.example.com/
 
-	Include		/etc/apache2/conf.d/local-log-vhosts.conf
-	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	/var/log/apache2/www.example.com-error.log
+	CustomLog	/var/log/apache2/www.example.com-access.log combined
 </VirtualHost>
 <VirtualHost *:80>
 	ServerName	example.com
 	ServerAlias	*.www.example.com
 	ServerAdmin	webmaster@example.com
 
+	Include		/etc/apache2/conf.d/local-log-origin.conf
+
 	RewriteEngine	On
 	RewriteRule	/	http://www.example.com/		[R]
 #	RewriteRule	/(.*)	http://www.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName	www.example.com:443
@@ -27,10 +29,11 @@
 	ServerAdmin	webmaster@example.com
 
 	Include		/etc/apache2/conf.d/local-ssl.conf
+	Include		/etc/apache2/conf.d/local-log-origin.conf
 
 	RewriteEngine	On
 	RewriteRule	/	http://www.example.com/	[R]
 #	RewriteRule	/(.*)	http://www.example.com/$1	[R]
 
-	TransferLog	/dev/null
+	CustomLog	/var/log/apache2/redirect.log origin
 </VirtualHost>