From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 29 Jan 2017 20:04:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'stapelberg/dyn'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a1affd759e5210c15dd1430326a4064778c74d3e;hp=634873b9551a5bf033c2dbd910666fb1325332ac;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'stapelberg/dyn'

* stapelberg/dyn:
  dyn.manpages.d.o: let auxserver handle redirects, serve static assets
---

diff --git a/modules/roles/templates/manpages/dyn.manpages.debian.org.erb b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
index ea9237c65..076e205ca 100644
--- a/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
+++ b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
@@ -11,22 +11,38 @@ Use common-debian-service-https-redirect * dyn.manpages.debian.org
 	ErrorLog /var/log/apache2/dyn.manpages.debian.org-error.log
 	CustomLog /var/log/apache2/dyn.manpages.debian.org-access.log privacy
 
-	# URLs which end in a slash do not need to be rewritten
-	RewriteEngine on
-	RewriteRule ^(.*/)$ "https://manpages.debian.org$1" [R=307,L]
-
-	# Redirect fully qualified URLs to the correct host.
-	RewriteCond "/srv/manpages.debian.org/www/%{REQUEST_FILENAME}" "-f" [OR]
-	RewriteCond "/srv/manpages.debian.org/www/%{REQUEST_FILENAME}.gz" "-f"
-	RewriteRule "^/(.*)" "https://manpages.debian.org/$1" [R=307,L]
-
-	# Use the correct host in redirects
-	Header edit Location "^/" "https://manpages.debian.org/"
-
-	<Location />
+	DocumentRoot /srv/manpages.debian.org/www
+
+	<Directory /srv/manpages.debian.org/www>
+		Require all granted
+		AllowOverride none
+
+		ExpiresActive On
+		ExpiresDefault "access plus 1 hours"
+
+		<Files ~ "^rwmap">
+			Order allow,deny
+			Deny from all
+		</Files>
+
+		# To set the correct Content-Type (e.g. text/html).
+		RemoveType .gz
+		AddEncoding gzip gz
+		FilterDeclare gzip CONTENT_SET
+		FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip,.*gzip/"
+		FilterChain gzip
+		Options +Multiviews
+	</Directory>
+
+	<Location /auxserver/>
 		ProxyPass "http://localhost:2431/"
 		ProxyPassReverse "http://localhost:2431/"
+
+		# Use the correct host in redirects
+		Header edit Location "^/" "https://manpages.debian.org/"
 	</Location>
+
+	ErrorDocument 404 /auxserver%{REQUEST_URI}?%{QUERY_STRING}
 </VirtualHost>
 
 # vim:set syn=apache: