X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=apache-conf.conf;h=f8d0a60dbc0b89c61b56931b80d01004aee13419;hp=881105a7380417344bb9d1790d84c7c5bd783eb6;hb=e71f5648d2823f89024c52b77f9ab04d23a75a2d;hpb=0331c68ea396b195686c2f264cac554dbd5e95c4

diff --git a/apache-conf.conf b/apache-conf.conf
index 881105a..f8d0a60 100644
--- a/apache-conf.conf
+++ b/apache-conf.conf
@@ -15,11 +15,44 @@
 
 <VirtualHost *:80>
 	ServerName nd.ruin.nu
+	ServerAlias ndtest.ruin.nu
 
-	RewriteEngine On
-        RewriteCond %{HTTPS} !=on
-	RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
+	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\" PUB"
+	</IfModule>
+
+	Alias /static /var/www/ndawn/root/static
+	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/
+
+	<Location />
+		Allow from all
+	</Location>
+
+	DeflateFilterNote ratio
+	<Location /static>
+		SetHandler default-handler
+
+		ExpiresActive On
+		ExpiresDefault "access plus 1 week"
+		#ExpiresByType text/css "access plus 1 week"
+		#ExpiresByType application/javascript "access plus 1 week"
+		#ExpiresByType image/png "access plus 1 week"
 
+		AddOutputFilterByType DEFLATE text/html
+		AddOutputFilterByType DEFLATE text/xml
+		AddOutputFilterByType DEFLATE text/css
+		AddOutputFilterByType DEFLATE application/javascript
+		AddOutputFilterByType DEFLATE application/x-javascript
+		AddOutputFilterByType DEFLATE application/xhtml+xml
+		AddOutputFilterByType DEFLATE application/xml
+		AddOutputFilterByType DEFLATE application/ms* application/vnd* application/postscript
+	</Location>
 </VirtualHost>
 
 Listen 1337
@@ -40,11 +73,12 @@ NameVirtualHost *:443
 
 <VirtualHost *:443>
 	ServerName nd.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
@@ -59,7 +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/
@@ -77,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