From c5a7c8a5669b1549e50d1c44a633f0400203ed46 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 22 Sep 2015 10:29:38 +0200 Subject: reproducible: also rewrite /$suite/armhf/$pkg urls as expected --- hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hosts/jenkins/etc/apache2/sites-available') diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net index 8f67429c..dc67a918 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net @@ -205,12 +205,12 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/$1.html -f RewriteRule ^/([a-z0-9.+-]+) /rb-pkg/experimental/amd64/$1.html [R=302,L] - # redirect rb.d.n/$suite/amd64/$PKG → rb.d.n/rb-pkg/$suite/amd64/$PKG.html + # redirect rb.d.n/$suite/(amd64|armhf)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/$1/amd64/$2.html -f - RewriteRule ^/(unstable|testing|experimental)/amd64/([a-z0-9.+-]+) /rb-pkg/$1/amd64/$2.html [R=302,L] + RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/$1/(amd64|armhf)/$2.html -f + RewriteRule ^/(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /rb-pkg/$1/$2/$3.html [R=302,L] # redirect rb.d.n/rb-pkg/$PKG.html → rb.d.n/rb-pkg/unstable/amd64/$PKG.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net -- cgit v1.2.3-70-g09d2