X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=apache-conf.conf;h=f8d0a60dbc0b89c61b56931b80d01004aee13419;hp=521331101c7abb25ef509b531fc5fc1c85173bba;hb=f3cd955b85092ea418d9c1de90be49c9f598527f;hpb=39cb1e2365f6d21c661e3f4dd8acacc5feae35bd

diff --git a/apache-conf.conf b/apache-conf.conf
index 5213311..f8d0a60 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -15,17 +15,17 @@
 
 <VirtualHost *:80>
 	ServerName nd.ruin.nu
-	ServerName ndtest.ruin.nu
+	ServerAlias ndtest.ruin.nu
 
 	ErrorLog /var/log/apache2/ndawn_error_log
 	<IfModule mod_log_config.c>
 		#TransferLog logs/ndawn_access_log
-		CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
+		CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\" PUB"
 	</IfModule>
 
 	Alias /static /var/www/ndawn/root/static
-	Alias /favicon.ico /var/www/ndawn/root/favicon.ico
 	Alias /robots.txt /var/www/ndawn/root/robots.txt
+	Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
 	FastCgiExternalServer /tmp/ndwebpub.fcgi -socket /tmp/ndweb.socket
 	Alias / /tmp/ndwebpub.fcgi/
@@ -73,12 +73,12 @@ NameVirtualHost *:443
 
 <VirtualHost *:443>
 	ServerName nd.ruin.nu
-	ServerName ndtest.ruin.nu
+	ServerAlias ndtest.ruin.nu
 
 	ErrorLog /var/log/apache2/ndawn_error_log
 	<IfModule mod_log_config.c>
 		#TransferLog logs/ndawn_access_log
-		CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\""
+		CustomLog /var/log/apache2/ndawn_access_log "%h %l %u [%{%F %H:%M:%S}t] \"%r\" %>s %b %T \"%{Referer}i\" \"%{User-Agent}i\" SSL"
 	</IfModule>
 
 	SSLEngine on
@@ -93,8 +93,8 @@ NameVirtualHost *:443
 	</IfModule>
 
 	Alias /static /var/www/ndawn/root/static
-	Alias /favicon.ico /var/www/ndawn/root/favicon.ico
 	Alias /robots.txt /var/www/ndawn/root/robots.txt
+	Alias /favicon.ico /var/www/ndawn/root/static/favicon.ico
 
 	FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
 	Alias / /tmp/ndweb.fcgi/
@@ -112,6 +112,7 @@ NameVirtualHost *:443
 		#ExpiresByType text/css "access plus 1 week"
 		#ExpiresByType application/javascript "access plus 1 week"
 		#ExpiresByType image/png "access plus 1 week"
+		Header append Cache-Control "public"
 
 		AddOutputFilterByType DEFLATE text/html
 		AddOutputFilterByType DEFLATE text/xml