X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=apache-conf.conf;h=4c21de9a6bc84d90a1378bef9d88c229157258b0;hb=5de3274bb521067ae091a9848f9f762eb3e1680f;hp=a58d0a79004109a7525138b54ca5585a55db9d3d;hpb=b16abeb1c6ad05ed081a3eba4fbd3f07e4b79c9c;p=ndwebbie.git

diff --git a/apache-conf.conf b/apache-conf.conf
index a58d0a7..4c21de9 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 /favicon.ico /var/www/ndawn/root/favicon.ico
+	Alias /robots.txt /var/www/ndawn/root/robots.txt
+
+	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,13 +73,19 @@ 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
+	SSLCertificateFile /etc/apache2/ssl/server.crt
+	SSLCertificateKeyFile /etc/apache2/ssl/server.key
+
+
 	<IfModule setenvif_module>
 		BrowserMatch ".*MSIE.*" \
 			nokeepalive ssl-unclean-shutdown \
@@ -55,6 +94,7 @@ NameVirtualHost *:443
 
 	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
 
 	FastCgiExternalServer /tmp/ndweb.fcgi -socket /tmp/ndweb.socket
 	Alias / /tmp/ndweb.fcgi/
@@ -72,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