From e61fd58dc36fa5a465f75d21b399034ef4869053 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 22 Jul 2014 10:49:54 +0200 Subject: [PATCH] Add lintian vhost --- modules/roles/manifests/static_mirror.pp | 5 ++ .../vhost/lintian.debian.org.erb | 54 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 8d1a58083..26ffa34bb 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -44,6 +44,11 @@ class roles::static_mirror { content => template('roles/static-mirroring/vhost/planet.debian.org.erb'), } + apache2::site { '010-lintian.debian.org': + site => 'lintian.debian.org', + content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'), + } + apache2::site { '010-static-vhosts-simple': site => 'static-vhosts-simple', content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'), diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb new file mode 100644 index 000000000..2d112f239 --- /dev/null +++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb @@ -0,0 +1,54 @@ + > + ServerName lintian.debian.org + ServerAdmin lintian-maint@debian.org + + ErrorLog /var/log/apache2/lintian.debian.org-error.log + CustomLog /var/log/apache2/lintian.debian.org-access.log privacy + + + UserDir disabled + + + DocumentRoot /srv/static.debian.org/mirrors/lintian.debian.org/cur + AddDefaultCharset utf-8 + + + # These two lines makes apache serve "lintian.log.gz" as a text/plain with encoding gzip + # making it easier to view the log in the browser. + RemoveType .gz + AddEncoding x-gzip .gz + AddType text/plain .log + + + AddOutputFilterByType DEFLATE image/svg+xml + AddOutputFilterByType DEFLATE text/plain + + + + + # Cache graphs for an hour (Technically, a "expires" of "24h after last mod" + # might be better, but oh well) + Header set Cache-Control "max-age=3600, must-revalidate, public" + + + + # Cache these for a year (3600 * 24 * 365.25) + # Files in here will change name if their content change + Header set Cache-Control "max-age=31557600, public" + + + RewriteEngine on + RewriteMap source-map txt:/srv/static.debian.org/mirrors/lintian.debian.org/cur/lookup-tables/source-packages + + # Re-direct from the "old" locations to the new ones + RewriteRule ^/reports/T(.*)\.html$ /tags/$1.html [L,R=permanent] + RewriteRule ^/reports/(.*)$ /$1 [L,R=permanent] + + # Map source packages to reports (this mapping is re-written once per lintian run, + # serve it as a 302 rather than a permanent redirect) + # Version-less request + RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE] + # Versioned request + RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE] + +# vim:set syn=apache: -- 2.20.1