diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-08-21 17:39:19 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-08-21 17:39:19 +0200 |
| commit | c51d60fcbd478ae77260357eb3c57efd4e61e7cf (patch) | |
| tree | d5fe2bed7560b6e19d244b7eb697881f93d596bd | |
| parent | 51da1828d559072c87ba589118060da082ed7d0d (diff) | |
| download | jenkins.debian.net-c51d60fcbd478ae77260357eb3c57efd4e61e7cf.tar.xz | |
reproducible: correctly use mod_rewrite to stop using javascript for the form
| -rwxr-xr-x | bin/reproducible_common.sh | 2 | ||||
| -rw-r--r-- | hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 75f608fd..6a34133d 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -240,7 +240,7 @@ write_page_header() { write_page "</ul>" if [ "$1" = "$MAINVIEW" ] ; then LATEST=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id = s.id WHERE r.status IN ('unreproducible') AND s.suite = 'unstable' AND s.architecture = 'amd64' AND s.id NOT IN (SELECT package_id FROM notes) ORDER BY build_date DESC LIMIT 23"|sort -R|head -1) - write_page "https://reproducible.debian.net/<form action=\"https://reproducible.debian.net\" method=\"GET\">" + write_page "<form action=\"https://reproducible.debian.net/redirect\" method=\"GET\">https://reproducible.debian.net/" write_page "<input type=\"text\" name=\"SrcPkg\" placeholder=\"Type my friend..\" value=\"$LATEST\" />" write_page "<input type=\"submit\" value=\"submit source package name\" />" write_page "</form>" diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net index 4345120c..ea377771 100644 --- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net +++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net @@ -186,12 +186,13 @@ Use common-debian-service-https-redirect reproducible.debian.net 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] - # redirect rb.d.n/reproducible.html?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html + # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html RewriteCond %{HTTP_HOST} reproducible\.debian\.net RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1.html -f - RewriteRule ^/reproducible.html?SrcPkg=([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1.html [R=302,L] + 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] # 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) |