From: Michael Andreen <harv@ruin.nu>
Date: Wed, 3 Jan 2018 16:30:27 +0000 (+0100)
Subject: Apache isn't used anymore
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=cf412d58916caebcd5be4b51c551a10e1156012f

Apache isn't used anymore
---

diff --git a/apache-conf.conf b/apache-conf.conf
deleted file mode 100644
index f8d0a60..0000000
--- a/apache-conf.conf
+++ /dev/null
@@ -1,126 +0,0 @@
-### Section 3: Virtual Hosts
-#
-# VirtualHost: If you want to maintain multiple domains/hostnames on your
-# machine you can setup VirtualHost containers for them. Most configurations
-# use only name-based virtual hosts so the server doesn't need to worry about
-# IP addresses. This is indicated by the asterisks in the directives below.
-#
-# Please see the documentation at 
-# <URL:http://httpd.apache.org/docs-2.0/vhosts/>
-# for further details before you try to setup virtual hosts.
-#
-# You may use the command line option '-S' to verify your virtual host
-# configuration.
-
-
-<VirtualHost *:80>
-	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\" 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
-
-<VirtualHost *:1337>
-	ServerName nd.ruin.nu
-
-	SSLEngine on
-	SSLCertificateFile /etc/apache2/ssl/nd.crt
-	SSLCertificateKeyFile /etc/apache2/ssl/nd.key
-
-	RewriteEngine On
-	RewriteRule ^/(.*) https://%{SERVER_NAME}%{REQUEST_URI} [R]
-
-</VirtualHost>
-
-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\" 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 \
-			downgrade-1.0 force-response-1.0
-	</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/ndweb.fcgi -socket /tmp/ndweb.socket
-	Alias / /tmp/ndweb.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"
-		Header append Cache-Control "public"
-
-		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>