summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_common.py2
-rwxr-xr-xbin/reproducible_common.sh2
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net20
4 files changed, 12 insertions, 13 deletions
diff --git a/TODO b/TODO
index e397cd1a..eba122ab 100644
--- a/TODO
+++ b/TODO
@@ -181,7 +181,6 @@ grep '(=.*).,.$' rygel_0.24.2-1.debbindiff.html | uniq -c | sort | grep -c '^\s*
** the grepping should probably only done on files younger then $check_frequency
* misc
-** move all content into /var/lib/userContent/reproducible/
** more graphs: graph average build duration by day
** meld bin/reproducible_setup_schroot.sh into bin/schroot-create.sh and alias the former to the latter
** "fork" etc/schroot/default into etc/schroot/reproducible
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index 393e5aa4..aa968d9b 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -35,7 +35,7 @@ defaultsuite = 'unstable'
defaultarch = 'amd64'
BIN_PATH = '/srv/jenkins/bin'
-BASE = '/var/lib/jenkins/userContent'
+BASE = '/var/lib/jenkins/userContent/reproducible'
REPRODUCIBLE_JSON = BASE + '/reproducible.json'
REPRODUCIBLE_DB = '/var/lib/jenkins/reproducible.db'
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index f1f87f8b..54fa6ea4 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -50,7 +50,7 @@ USERTAGS="toolchain infrastructure timestamps fileordering buildpath username ho
# we only need them for html creation but we cannot declare them in a function
declare -A SPOKENTARGET
-BASE="/var/lib/jenkins/userContent"
+BASE="/var/lib/jenkins/userContent/reproducible"
mkdir -p "$BASE"
# create subdirs for suites
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index f90ea88f..d7c9ffa9 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -145,9 +145,9 @@ Use common-debian-service-https-redirect reproducible.debian.net
Use common-directives reproducible.debian.net
SSLCertificateFile /etc/apache2/ssl/reproducible.debian.net.pem
- DocumentRoot /var/lib/jenkins/userContent
+ DocumentRoot /var/lib/jenkins/userContent/reproducible
- <Directory /var/lib/jenkins/userContent/artifacts>
+ <Directory /var/lib/jenkins/userContent/reproducible/artifacts>
HeaderName .HEADER.html
</Directory>
@@ -167,14 +167,14 @@ Use common-debian-service-https-redirect reproducible.debian.net
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/issues/unstable/$1 -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/issues/unstable/$1 -f
RewriteRule ^/issues/([a-z0-9.+-_]+) /issues/unstable/$1 [R=302,L]
# redirect rb.d.n/$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/rb-pkg/unstable/amd64/$1.html -f
+ 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/$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
@@ -182,39 +182,39 @@ Use common-debian-service-https-redirect reproducible.debian.net
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/rb-pkg/experimental/amd64/$1.html -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/$1.html -f
RewriteRule ^/([a-z0-9.+-]+) /rb-pkg/experimental/amd64/$1.html [R=302,L]
# redirect rb.d.n/$suite/amd64/$PKG → rb.d.n/rb-pkg/$suite/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/rb-pkg/$1/amd64/$2.html -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/$1/amd64/$2.html -f
RewriteRule ^/(unstable|testing|experimental)/amd64/([a-z0-9.+-]+) /rb-pkg/$1/amd64/$2.html [R=302,L]
# redirect rb.d.n/rb-pkg/$PKG.html → rb.d.n/rb-pkg/$suite/$arch/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/rb-pkg/unstable/amd64/$1 -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1 -f
RewriteRule ^/rb-pkg/([a-z0-9.+-]+) /rb-pkg/unstable/amd64/$1 [R=301,L]
# the same for /dbd/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/dbd/unstable/amd64/$1 -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/dbd/unstable/amd64/$1 -f
RewriteRule ^/dbd/([a-z0-9.+-_]+) /dbd/unstable/amd64/$1 [R=301,L]
# the same for /rbuild/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/rbuild/unstable/amd64/$1 -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/rbuild/unstable/amd64/$1 -f
RewriteRule ^/rbuild/([a-z0-9.+-_]+) /rbuild/unstable/amd64/$1 [R=301,L]
# the same for /buildinfo/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/buildinfo/unstable/amd64/$1 -f
+ RewriteCond /var/lib/jenkins/userContent/reproducible/buildinfo/unstable/amd64/$1 -f
RewriteRule ^/buildinfo/([a-z0-9.+-_]+) /buildinfo/unstable/amd64/$1 [R=301,L]
# redirect some rb.d.n/index_*.html to the suite/arch relative one
RewriteCond %{HTTP_HOST} reproducible\.debian\.net