From 6d15005ff0c61de7af50b9bdd1eb48b7d23bd026 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Wed, 8 Jul 2020 13:36:05 +0200
Subject: [PATCH] Minor fixes. [skip-ci]
---
README.md | 2 +-
nomad/cli/client/integrationtests.py | 2 +-
ops/helm/nomad/templates/gui-deployment.yml | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 17a43f2a7f..a0e3909203 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ nomad parse --show-backend <your-file-to-parse>
### For NOMAD developer
-Read the [docs](https://repository.nomad-coe.eu/app/docs). The documentation is also part
+Read the [docs](https://repository.nomad-coe.eu/app/docs/index.html). The documentation is also part
of the source code. It covers aspects like introduction, architecture, development setup/deployment,
contributing, and API reference.
diff --git a/nomad/cli/client/integrationtests.py b/nomad/cli/client/integrationtests.py
index 30f5a38658..a5813c9c68 100644
--- a/nomad/cli/client/integrationtests.py
+++ b/nomad/cli/client/integrationtests.py
@@ -166,7 +166,7 @@ def integrationtests(ctx, skip_parsers, skip_publish, skip_doi, skip_mirror):
'shared_with': [{'value': 'author3-id'}],
'datasets': [{'value': dataset}]}
- payload = dict(actions=actions, query=dict(upload_id=upload.upload_id))
+ payload = dict(actions=actions, query=dict(upload_id=[upload.upload_id]))
result = client.repo.edit_repo(payload=payload).response().result
assert result.success
assert client.datasets.get_dataset(name=dataset).response().result['name'] == dataset
diff --git a/ops/helm/nomad/templates/gui-deployment.yml b/ops/helm/nomad/templates/gui-deployment.yml
index 13ed15ca92..47f156532c 100644
--- a/ops/helm/nomad/templates/gui-deployment.yml
+++ b/ops/helm/nomad/templates/gui-deployment.yml
@@ -36,6 +36,17 @@ data:
proxy_pass http://{{ include "nomad.fullname" . }}-app:8000;
}
+ location {{ .Values.proxy.external.path }}/docs/ {
+ proxy_intercept_errors on;
+ error_page 404 = @redirect_to_index_docs;
+ proxy_pass http://{{ include "nomad.fullname" . }}-app:8000;
+ }
+
+ location @redirect_to_index_docs {
+ rewrite ^ {{ .Values.proxy.external.path }}/docs/index.html break;
+ proxy_pass http://{{ include "nomad.fullname" . }}-app:8000;
+ }
+
location {{ .Values.proxy.external.path }}/encyclopedia/ {
proxy_intercept_errors on;
error_page 404 = @redirect_to_encyclopedia_index;
--
GitLab