diff options
| author | Valerie R Young <spectranaut@riseup.net> | 2016-06-10 13:09:28 -0400 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-10 19:39:11 +0200 |
| commit | 51d6c1a9c9178e7489829dd3201e60ddbc1624bf (patch) | |
| tree | 6ad4b5cd0d93c664df1f3bd731dcf9e92bc849f7 | |
| parent | b3e565dc1374d3e2a1cbf12c4cce54a19728dbae (diff) | |
| download | jenkins.debian.net-51d6c1a9c9178e7489829dd3201e60ddbc1624bf.tar.xz | |
reproducible debian: fix more links, edit more redirects
| -rwxr-xr-x | bin/reproducible_common.sh | 4 | ||||
| -rw-r--r-- | hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index eaa77743..495682c4 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -263,7 +263,7 @@ write_page_header() { if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$ARCH" ] ; then CLASS=" class=\"active\"" fi - write_page " <a href=\"debian/$SUITE/index_suite_${i}_stats.html\"$CLASS>$i</a> " + write_page " <a href=\"/debian/$SUITE/index_suite_${i}_stats.html\"$CLASS>$i</a> " CLASS="" done write_page "</li>" @@ -273,7 +273,7 @@ write_page_header() { if [ "$1" = "suite_arch_stats" ] && [ "$i" = "$SUITE" ] ; then CLASS=" class=\"active\"" fi - write_page " <a href=\"debian/$i/index_suite_${ARCH}_stats.html\"$CLASS>$i</a> " + write_page " <a href=\"/debian/$i/index_suite_${ARCH}_stats.html\"$CLASS>$i</a> " CLASS="" done write_page "</li>" 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 f2d95fd4..4d44e3a5 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf @@ -440,32 +440,32 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} ^/index_reproducible.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_FTBR.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_FTBFS.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_depwait.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_404.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_not_for_us.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_blacklisted.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_last_24h.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_last_48h.html$ [or] - RewriteCond %{REQUEST_URI} ^/index_all_abc.html$ + RewriteCond %{REQUEST_URI} ^/(debian/|)index_reproducible.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_FTBR.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_FTBFS.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_depwait.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_404.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_not_for_us.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_blacklisted.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_last_24h.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_last_48h.html$ [or] + RewriteCond %{REQUEST_URI} ^/(debian/|)index_all_abc.html$ RewriteRule ^/(debian/|)?(.+) /debian/unstable/amd64/$2 [R=301,L] # redirect (/testing|unstable|/experimental) to (/testing|/unstable|/experimental)/index_suite_amd64_stats.html # note: the missing slash in the RewriteRule is wanted to avoid a double slash RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org - RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$ + RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)(/|)$ RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L] # 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|i386)(/|)$ + RewriteCond %{REQUEST_URI} ^/(debian/|)(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$ RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L] # 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|i386)(/|)$ + RewriteCond %{REQUEST_URI} ^/(debian/|)(amd64|armhf|i386)(/|)$ RewriteRule ^/(debian/|)([a-z0-9]+) /debian/unstable/index_suite_$2_stats.html [R,L] # redirect /coreboot/ to coreboot/coreboot.html @@ -505,7 +505,7 @@ Use common-debian-service-https-redirect reproducible-builds.org # redirect /issues/ to /index_issues.html RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org - RewriteCond %{REQUEST_URI} ^/issues(/|)$ + RewriteCond %{REQUEST_URI} ^/(debian/|)issues(/|)$ RewriteRule ^/(debian/|)(.*) /debian/index_issues.html [R,L] # temporary redirect until the html is rewritten |