reproducible: rewrite both /$project as well as /$project/ URLs

1 files changed, 18 insertions, 18 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 c98b4f46..4f4ba696 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -277,12 +277,12 @@ 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} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/$
+	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$
 	RewriteRule ^/(.*) /$1index_suite_amd64_stats.html [R,L]
 
 	# redirect (/testing|unstable|/experimental)/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html
 	RewriteCond %{HTTP_HOST} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)/$
+	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)(/|)$
 	RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) /$1/index_suite_$2_stats.html [R,L]
 
 	# redirect (/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html
@@ -293,35 +293,35 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	# redirect /coreboot/ to coreboot/coreboot.html
 	# note: the missing slash in the RewriteRule is wanted to avoid a double slash
 	RewriteCond %{HTTP_HOST} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/coreboot/$
+	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} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/openwrt/$
+	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} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/netbsd/$
+	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} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/freebsd/$
+	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} reproducible\.debian\.net
-	RewriteCond %{REQUEST_URI} ^/archlinux/$
+	RewriteCond %{REQUEST_URI} ^/archlinux(/|)$
 	RewriteRule ^/(.*) /archlinux/archlinux.html [R,L]
 
 	# redirect /issues/ to /index_issues.html
-	RewriteCond %{REQUEST_URI} ^/issues/$
+	RewriteCond %{REQUEST_URI} ^/issues(/|)$
 	RewriteRule ^/(.*) /index_issues.html [R,L]
 
 	<Proxy *>
@@ -443,12 +443,12 @@ 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} ^/(testing|unstable|experimental)/$
+	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$
 	RewriteRule ^/(.*) /$1index_suite_amd64_stats.html [R,L]
 
 	# redirect (/testing|unstable|/experimental)/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)/$
+	RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf)(/|)$
 	RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) /$1/index_suite_$2_stats.html [R,L]
 
 	# redirect (/(amd64|armhf) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf)_stats.html
@@ -459,45 +459,45 @@ Use common-debian-service-https-redirect reproducible-builds.org
 	# 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/$
+	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/$
+	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/$
+	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/$
+	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/$
+	RewriteCond %{REQUEST_URI} ^/archlinux(/|)$
 	RewriteRule ^/(.*) /archlinux/archlinux.html [R,L]
 
 	# redirect /issues/ to /index_issues.html
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/issues/$
+	RewriteCond %{REQUEST_URI} ^/issues(/|)$
 	RewriteRule ^/(.*) /index_issues.html [R,L]
 
 	# temporary redirects until the html is rewritten
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/debian/$
+	RewriteCond %{REQUEST_URI} ^/debian(/|)$
 	RewriteRule ^/?(.*) /reproducible.html [R,L]
 	# and another:
 	RewriteCond %{HTTP_HOST} tests\.reproducible-builds\.org
-	RewriteCond %{REQUEST_URI} ^/fedora/$
+	RewriteCond %{REQUEST_URI} ^/fedora(/|)$
 	RewriteRule ^/?(.*) /rpms/fedora-23.html [R,L]
 
 	<Proxy *>