X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fmanpages%2Fdyn.manpages.debian.org.erb;h=3d430e8175caa538a953f5e7f9b33eb86175f0c3;hb=25796b13e329fe9fa636c195aeaec518eb511541;hp=ea9237c65e67ab998c6bac4a65624a9b8f4c1075;hpb=142d7dd48ee282fc7cab2c036327dca1f4d87b07;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/manpages/dyn.manpages.debian.org.erb b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
index ea9237c65..3d430e817 100644
--- a/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
+++ b/modules/roles/templates/manpages/dyn.manpages.debian.org.erb
@@ -11,22 +11,37 @@ 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]
+ DocumentRoot /srv/manpages.debian.org/www
- # 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]
+
+ Require all granted
+ AllowOverride none
- # Use the correct host in redirects
- Header edit Location "^/" "https://manpages.debian.org/"
+ ExpiresActive On
+ ExpiresDefault "access plus 1 hours"
-
+
+ Require all denied
+
+
+ # 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
+
+
+
ProxyPass "http://localhost:2431/"
ProxyPassReverse "http://localhost:2431/"
+
+ # Use the correct host in redirects
+ Header edit Location "^/" "https://manpages.debian.org/"
+
+ ErrorDocument 404 /auxserver%{REQUEST_URI}?%{QUERY_STRING}
# vim:set syn=apache: