diff --git a/README.md b/README.md index 17a43f2a7f53067f01b0838350eba262c9d53822..a0e3909203c7efb7a485ea98e20fa1880c333ff0 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 30f5a3865810ecee84261ac3de625da125c3eacf..a5813c9c689496e869babc95619a5c42e0db08dd 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 13ed15ca92e71325eae6f66c418955621fb3b4d4..47f156532ccd836dff8f5d7bad248ee3dac7c085 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;