[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: get rid off javascript in dashboard, thanks Ulrike

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 168494c0db763d8cff41469388af8100cb1a5784
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Aug 21 15:27:50 2015 +0200

    reproducible: get rid off javascript in dashboard, thanks Ulrike
---
 bin/reproducible_common.sh                                   | 5 +++--
 hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index b84a466..0dfd7be 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -240,9 +240,10 @@ 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 "<form onsubmit=\"location.href='https://reproducible.debian.net/' + document.getElementById('SrcPkg').value; return false;\">"
-		write_page "https://reproducible.debian.net/<input type=\"text\" id=\"SrcPkg\" value=\"$LATEST\"/>"
+		write_page "<form action=\"https://reproducible.debian.net\" method=\"GET\">"
+		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>"
 		write_page "<p>There's a new HowTo <b>in early development</b>: <a href=\"/howto\">How to make your software reproducible</a>? We appreciate feedback on it, but please don't consider this document to be finished, comprehensive or correct yet.</p>"
 	fi
 	write_page "</header>"
diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
index 5eb342e..4345120 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net
@@ -186,6 +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
+	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]
+
 	# 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git