summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-06-11 20:19:32 +0000
committerHolger Levsen <holger@layer-acht.org>2016-06-11 22:32:10 +0200
commitd16e137ae3e7fdd40f675bfe78b14fcd5d2bf85e (patch)
treed96c6946953eb03aa59261c4720a0701bd9b5bd4
parent432b5ef4a3d3d39873c6c8007d71206fca6749d8 (diff)
downloadjenkins.debian.net-d16e137ae3e7fdd40f675bfe78b14fcd5d2bf85e.tar.xz
apache2 conf: fix comments to reflect reality: the hostname now is t.r-b.o, not rb.d.n anymore
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf18
1 files changed, 9 insertions, 9 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 d153eb53..2d70fa35 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -357,24 +357,24 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_URI} ^/userContent
RewriteRule ^/userContent/(.*)$ /$1 [R=301,L]
- # redirect debian specific requests from rb.d.n/$URI → rb.d.n/debian/$URI
+ # redirect debian specific requests from t.r-b.o/$URI → t.r-b.o/debian/$URI
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/$1 -f
RewriteCond %{REQUEST_URI} ^/(static|testing|unstable|experimental|history|rb-pg|notes|issues|rbuild|logs|dbd|dbdtxt|index_.*\.html|stats_.*\.png|reproducible.*\.json).*$
RewriteRule ^/(.*) /debian/$1 [R=302,L]
- # redirect rb.d.n/issues/$ISSUE → rb.d.n/issues/unstable/$ISSUE
+ # redirect t.r-b.o/issues/$ISSUE → t.r-b.o/issues/unstable/$ISSUE
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/issues/unstable/$2 -f
RewriteRule ^/(debian/|)issues/([a-z0-9.+-_]+) /debian/issues/unstable/$2 [R=302,L]
- # redirect rb.d.n/$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect t.r-b.o/$PKG → t.r-b.o/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$2.html -f
RewriteRule ^/(debian/|)([a-z0-9.+-]+) /debian/rb-pkg/unstable/amd64/$2.html [R=302,L]
- # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect t.r-b.o/redirect/?SrcPkg=$PKG → t.r-b.o/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
@@ -383,26 +383,26 @@ Use common-debian-service-https-redirect reproducible-builds.org
# 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
+ # redirect t.r-b.o/$PKG → t.r-b.o/rb-pkg/experimental/amd64/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/$2.html -f
RewriteRule ^/(debian/|)([a-z0-9.+-]+) /debian/rb-pkg/experimental/amd64/$2.html [R=302,L]
- # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
+ # redirect t.r-b.o/redirect/?SrcPkg=$PKG → t.r-b.o/rb-pkg/experimental/amd64/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
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
+ # redirect t.r-b.o/$suite/(amd64|armhf|i386)/$PKG → t.r-b.o/rb-pkg/$suite/$arch/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/$2/$3/$4.html -f
RewriteRule ^/(debian/|)(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) /debian/rb-pkg/$2/$3/$4.html [R=302,L]
- # redirect rb.d.n/rb-pkg/$PKG.html → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect t.r-b.o/rb-pkg/$PKG.html → t.r-b.o/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$2 -f
@@ -422,7 +422,7 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond /var/lib/jenkins/userContent/reproducible/debian/buildinfo/unstable/amd64/$2 -f
RewriteRule ^/(debian/|)buildinfo/([a-z0-9.+-_]+) /debian/buildinfo/unstable/amd64/$2 [R=301,L]
- # redirect some rb.d.n/index_*.html to the suite/arch relative one
+ # redirect some t.r-b.o/index_*.html to the suite/arch relative one
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} ^/(debian/|)index_reproducible.html$ [or]