From b9ed23989c330483b4ffc0eac4762653a69ffaa7 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 29 Mar 2016 00:01:36 -0400 Subject: reproducible debian: add rewrites for i386 --- .../apache2/sites-available/jenkins.debian.net.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf index 72c2d38a..8bbbb9b6 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf @@ -227,7 +227,7 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/%2.html -f RewriteRule ^/redirect https://tests.reproducible-builds.org/rb-pkg/experimental/amd64/%2.html? [R=302,L] - # redirect rb.d.n/$suite/(amd64|armhf)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html + # redirect rb.d.n/$suite/(amd64|armhf|i386)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d @@ -280,14 +280,14 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$ RewriteRule ^/(.*) https://tests.reproducible-builds.org/$1/index_suite_amd64_stats.html [R,L] - # redirect (/testing|unstable|/experimental)/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html + # redirect (/testing|unstable|/experimental)/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net - RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)(/|)$ + RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$ RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) https://tests.reproducible-builds.org/$1/index_suite_$2_stats.html [R,L] - # redirect (/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html + # redirect (/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net - RewriteCond %{REQUEST_URI} ^/(amd64|armhf)(/|)$ + RewriteCond %{REQUEST_URI} ^/(amd64|armhf|i386)(/|)$ RewriteRule ^/([a-z0-9]+) https://tests.reproducible-builds.org/unstable/index_suite_$1_stats.html [R,L] # redirect /coreboot/ to coreboot/coreboot.html @@ -399,7 +399,7 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/%2.html -f RewriteRule ^/redirect /rb-pkg/experimental/amd64/%2.html? [R=302,L] - # redirect rb.d.n/$suite/(amd64|armhf)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html + # redirect rb.d.n/$suite/(amd64|armhf|i386)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d @@ -452,14 +452,14 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$ RewriteRule ^/(.*) /$1/index_suite_amd64_stats.html [R,L] - # redirect (/testing|unstable|/experimental)/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html + # redirect (/testing|unstable|/experimental)/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org - RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)(/|)$ + RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$ RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) /$1/index_suite_$2_stats.html [R,L] - # redirect (/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html + # redirect (/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org - RewriteCond %{REQUEST_URI} ^/(amd64|armhf)(/|)$ + RewriteCond %{REQUEST_URI} ^/(amd64|armhf|i386)(/|)$ RewriteRule ^/([a-z0-9]+) /unstable/index_suite_$1_stats.html [R,L] # redirect /coreboot/ to coreboot/coreboot.html -- cgit v1.2.3-70-g09d2