summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-11-29 02:17:18 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2018-11-29 02:17:18 +0100
commit5008ddaa11eda6f7e9633360960b5d0b4dfc3810 (patch)
tree8f7499e569961a4ec7d8d1a0f8d2ae321daf5073
parent471cf8bd17dfa7bae14e34914164369527a3ed67 (diff)
downloaddeployment-5008ddaa11eda6f7e9633360960b5d0b4dfc3810.tar.gz
deployment-5008ddaa11eda6f7e9633360960b5d0b4dfc3810.tar.bz2
deployment-5008ddaa11eda6f7e9633360960b5d0b4dfc3810.zip
Auditor reports.
Put reports under 'test' and 'demo' home directories, and update nginx in order to serve those reports.
-rwxr-xr-xbuildbot/make_auditor_reports.sh2
-rw-r--r--etc/nginx/sites-enabled/demo.site5
-rw-r--r--etc/nginx/sites-enabled/test.site5
3 files changed, 11 insertions, 1 deletions
diff --git a/buildbot/make_auditor_reports.sh b/buildbot/make_auditor_reports.sh
index 18648d8..fdd1b12 100755
--- a/buildbot/make_auditor_reports.sh
+++ b/buildbot/make_auditor_reports.sh
@@ -17,7 +17,7 @@ DATE=$(date +%Y-%m-%d)
REPORT_FILE=/home/${ACTIVE_COLOR}/audit_report.${DATE}
SUDO_COLOR="sudo -u ${ACTIVE_COLOR}"
JINJA_TEMPLATE="auditor-report.tex.j2"
-REPORTS_DIRECTORY="/home/${ACTIVE_COLOR}/fixme"
+REPORTS_DIRECTORY="/home/${TALER_DEPLOYMENT}/reports"
${SUDO_COLOR} taler-auditor > ${REPORT_FILE}.txt
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
index 06b3e29..288ac65 100644
--- a/etc/nginx/sites-enabled/demo.site
+++ b/etc/nginx/sites-enabled/demo.site
@@ -30,6 +30,11 @@ server {
proxy_pass http://unix:/home/demo/sockets/auditor.http:/;
}
+ location /reports {
+ rewrite "^/reports/(.*)" /$1 break;
+ root /home/demo/reports;
+ }
+
location / {
rewrite ^/$ /en/ redirect;
rewrite ^/(..)/$ /$1/index.html break;
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
index 3b73466..a5158e5 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -70,6 +70,11 @@ server {
proxy_pass http://unix:/home/test/sockets/auditor.http:/;
}
+ location /reports {
+ rewrite "^/reports/(.*)" /$1 break;
+ root /home/test/reports;
+ }
+
location / {
# Redirection technique explainted at
# https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/