From 432b5ef4a3d3d39873c6c8007d71206fca6749d8 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Sat, 11 Jun 2016 20:15:50 +0000 Subject: apache2 conf: remove useless RewriteCond on %{HTTP_HOST} the host matches for sure anyway as we use only ServerName with no chances of reaching that virtualhost using another name (e.g. through ServerAlias which we don't use). Signed-off-by: Holger Levsen --- .../sites-available/jenkins.debian.net.conf | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'hosts/jenkins/etc') 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 b87260c3..d153eb53 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf @@ -116,7 +116,6 @@ Use common-debian-service-https-redirect reproducible-builds.org RewriteRule ^ - [F] # a bunch of redirects to point people to https://reproducible.debian.net - RewriteCond %{HTTP_HOST} jenkins\.debian\.net RewriteCond %{REQUEST_URI} ^/userContent/reproducible.html$ [or] RewriteCond %{REQUEST_URI} ^/userContent/reproducible.json$ [or] RewriteCond %{REQUEST_URI} ^/userContent/index_issues.html$ [or] @@ -349,39 +348,33 @@ Use common-debian-service-https-redirect reproducible-builds.org # use reproducible.html as "home page" - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_URI} ^/$ RewriteRule ^/(.*) /debian/reproducible.html [R,L] # drop the (old|ugly) /userContent/ directory from the url - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_URI} ^/userContent RewriteRule ^/userContent/(.*)$ /$1 [R=301,L] # redirect debian specific requests from rb.d.n/$URI → rb.d.n/debian/$URI - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org 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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org 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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org 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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$ @@ -391,14 +384,12 @@ 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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org 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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$ @@ -406,38 +397,32 @@ Use common-debian-service-https-redirect reproducible-builds.org 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/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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$2 -f RewriteRule ^/(debian/|)rb-pkg/([a-z0-9.+-]+) /debian/rb-pkg/unstable/amd64/$2 [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/debian/dbd/unstable/amd64/$2 -f RewriteRule ^/(debian/|)dbd/([a-z0-9.+-_]+) /debian/dbd/unstable/amd64/$2 [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/debian/rbuild/unstable/amd64/$2 -f RewriteRule ^/(debian/|)rbuild/([a-z0-9.+-_]+) /debian/rbuild/unstable/amd64/$2 [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/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 - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_URI} ^/(debian/|)index_reproducible.html$ [or] @@ -454,62 +439,51 @@ Use common-debian-service-https-redirect reproducible-builds.org # 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} ^/(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} ^/(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} ^/(debian/|)(amd64|armhf|i386)(/|)$ RewriteRule ^/(debian/|)([a-z0-9]+) /debian/unstable/index_suite_$2_stats.html [R,L] # redirect /coreboot/ to coreboot/coreboot.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} ^/coreboot(/|)$ RewriteRule ^/(.*) /coreboot/coreboot.html [R,L] # redirect /openwrt/ to openwrt/openwrt.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} ^/openwrt(/|)$ RewriteRule ^/(.*) /openwrt/openwrt.html [R,L] # redirect /netbsd/ to netbsd/netbsd.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} ^/netbsd(/|)$ RewriteRule ^/(.*) /netbsd/netbsd.html [R,L] # redirect /freebsd/ to freebsd/freebsd.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} ^/freebsd(/|)$ RewriteRule ^/(.*) /freebsd/freebsd.html [R,L] # redirect /archlinux/ to archlinux/archlinux.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} ^/archlinux(/|)$ RewriteRule ^/(.*) /archlinux/archlinux.html [R,L] # redirect /fedora/ properly… - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_URI} ^/fedora(/|)$ RewriteRule ^/?(.*) /rpms/fedora-23.html [R,L] # redirect /issues/ to /index_issues.html - RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org RewriteCond %{REQUEST_URI} ^/(debian/|)issues(/|)$ RewriteRule ^/(debian/|)(.*) /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 ^/?(.*) /debian/reproducible.html [R,L] -- cgit v1.2.3-70-g09d2