summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc
diff options
context:
space:
mode:
authorValerie R Young <spectranaut@riseup.net>2016-06-08 19:09:56 -0400
committerValerie R Young <spectranaut@riseup.net>2016-06-08 22:22:40 -0400
commit3ce1ce586c0d8079e8ce9ebe5fd1c2f8b66dfb92 (patch)
tree0380c171824130c390e5f84b957355f39c71554c /hosts/jenkins/etc
parentf836d85d3ded48ee8331d836a01e09ba3ce70dcb (diff)
downloadjenkins.debian.net-3ce1ce586c0d8079e8ce9ebe5fd1c2f8b66dfb92.tar.xz
reproducible debian: bug fix: only debian html belongs in tests.r-b.org/debian
Diffstat (limited to 'hosts/jenkins/etc')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf52
1 files changed, 26 insertions, 26 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 7b187592..4f01a075 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -364,23 +364,23 @@ 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 /var/lib/jenkins/userContent/reproducible/issues/unstable/$1 -f
- RewriteRule ^/issues/([a-z0-9.+-_]+) /issues/unstable/$1 [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/issues/unstable/$1 -f
+ RewriteRule ^/issues/([a-z0-9.+-_]+) /debian/issues/unstable/$1 [R=302,L]
# redirect rb.d.n/$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1.html -f
- RewriteRule ^/([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1.html [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$1.html -f
+ RewriteRule ^/([a-z0-9.+-]+) /debian/rb-pkg/unstable/amd64/$1.html [R=302,L]
# redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/%2.html -f
- RewriteRule ^/redirect /rb-pkg/unstable/amd64/%2.html? [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/%2.html -f
+ RewriteRule ^/redirect /debian/rb-pkg/unstable/amd64/%2.html? [R=302,L]
# the following two rules are fallbacks for the previous two redirects and should only catch packages which are only in experimental
@@ -388,48 +388,48 @@ 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 /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]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/$1.html -f
+ RewriteRule ^/([a-z0-9.+-]+) /debian/rb-pkg/experimental/amd64/$1.html [R=302,L]
# redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/%2.html -f
- RewriteRule ^/redirect /rb-pkg/experimental/amd64/%2.html? [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/%2.html -f
+ RewriteRule ^/redirect /debian/rb-pkg/experimental/amd64/%2.html? [R=302,L]
# 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
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/$1/$2/$3.html -f
- RewriteRule ^/(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /rb-pkg/$1/$2/$3.html [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/$1/$2/$3.html -f
+ RewriteRule ^/(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /debian/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} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1 -f
- RewriteRule ^/rb-pkg/([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$1 -f
+ RewriteRule ^/rb-pkg/([a-z0-9.+-]+) /debian/rb-pkg/unstable/amd64/$1 [R=301,L]
# the same for /dbd/
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/dbd/unstable/amd64/$1 -f
- RewriteRule ^/dbd/([a-z0-9.+-_]+) /dbd/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/dbd/unstable/amd64/$1 -f
+ RewriteRule ^/dbd/([a-z0-9.+-_]+) /debian/dbd/unstable/amd64/$1 [R=301,L]
# the same for /rbuild/
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rbuild/unstable/amd64/$1 -f
- RewriteRule ^/rbuild/([a-z0-9.+-_]+) /rbuild/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rbuild/unstable/amd64/$1 -f
+ RewriteRule ^/rbuild/([a-z0-9.+-_]+) /debian/rbuild/unstable/amd64/$1 [R=301,L]
# the same for /buildinfo/
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/buildinfo/unstable/amd64/$1 -f
- RewriteRule ^/buildinfo/([a-z0-9.+-_]+) /buildinfo/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/buildinfo/unstable/amd64/$1 -f
+ RewriteRule ^/buildinfo/([a-z0-9.+-_]+) /debian/buildinfo/unstable/amd64/$1 [R=301,L]
# redirect some rb.d.n/index_*.html to the suite/arch relative one
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_FILENAME} !-f
@@ -444,23 +444,23 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_URI} ^/index_last_24h.html$ [or]
RewriteCond %{REQUEST_URI} ^/index_last_48h.html$ [or]
RewriteCond %{REQUEST_URI} ^/index_all_abc.html$
- RewriteRule ^/?(.+) /unstable/amd64/$1 [R=301,L]
+ RewriteRule ^/?(.+) /debian/unstable/amd64/$1 [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)(/|)$
- RewriteRule ^/(.*) /$1/index_suite_amd64_stats.html [R,L]
+ RewriteRule ^/(.*) /debian/$1/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)(/|)$
- RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) /$1/index_suite_$2_stats.html [R,L]
+ RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) /debian/$1/index_suite_$2_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)(/|)$
- RewriteRule ^/([a-z0-9]+) /unstable/index_suite_$1_stats.html [R,L]
+ RewriteRule ^/([a-z0-9]+) /debian/unstable/index_suite_$1_stats.html [R,L]
# redirect /coreboot/ to coreboot/coreboot.html
# note: the missing slash in the RewriteRule is wanted to avoid a double slash
@@ -500,12 +500,12 @@ 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(/|)$
- RewriteRule ^/(.*) /index_issues.html [R,L]
+ RewriteRule ^/(.*) /debian/index_issues.html [R,L]
# temporary redirect until the html is rewritten
RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
RewriteCond %{REQUEST_URI} ^/debian(/|)$
- RewriteRule ^/?(.*) /reproducible.html [R,L]
+ RewriteRule ^/?(.*) /debian/reproducible.html [R,L]
<Proxy *>
Require all granted