diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-01-06 11:41:06 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-01-06 11:41:06 +0100 |
| commit | 6b289c6eba9c43451cbab5ba76288d310f13d473 (patch) | |
| tree | 17b2f69723ccca2892e977a8ebabd6f2391de280 | |
| parent | d7660a292ded8dec37bdb9642c9479d5eba2d9b1 (diff) | |
| download | jenkins.debian.net-6b289c6eba9c43451cbab5ba76288d310f13d473.tar.xz | |
reproducible: extend redirects for pkg search to also match packages only in experimental
| -rw-r--r-- | hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf | 11 |
1 files changed, 10 insertions, 1 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 b5d39a82..5a0e1c24 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf @@ -201,14 +201,23 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/%2.html -f RewriteRule ^/redirect /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 + # redirect rb.d.n/$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html - # (this is the fallback for the previous redirect and should only catch packages which are only in experimental) RewriteCond %{HTTP_HOST} reproducible\.debian\.net 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] + # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html + RewriteCond %{HTTP_HOST} reproducible\.debian\.net + 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] + # 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 |