Commit d4b16403 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Minor configuration fixes. [skip-ci]

parent f3953247
Pipeline #51197 skipped
......@@ -112,6 +112,13 @@ spec:
value: "{{ .Values.api.console_loglevel }}"
- name: NOMAD_LOGSTASH_LEVEL
value: "{{ .Values.api.logstash_loglevel }}"
{{ if .Values.postgres.password_secret }}
- name: NOMAD_REPOSITORY_DB_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.postgres.password_secret }}
key: password
{{ end }}
command: ["python", "-m", "gunicorn.app.wsgiapp", "--timeout", "3600", "--config", "gunicorn.conf", "--log-config", "gunicorn.log.conf", "-w", "{{ .Values.api.worker }}", "-b 0.0.0.0:8000", "nomad.api:app"]
livenessProbe:
httpGet:
......
......@@ -18,10 +18,10 @@ data:
try_files $uri {{ .Values.proxy.external.path }}/gui/index.html;
}
location {{ .Values.proxy.external.path }}/gui/service-worker.js {
root /app/;
rewrite ^{{ .Values.proxy.external.path }}/gui/(.*)$ /nomad/$1 break;
more_clear_headers "Cache-Control";
add_header Cache-Control "public, max-age=60, s-maxage=60";
expires -1;
root /app/;
rewrite ^{{ .Values.proxy.external.path }}/gui/service-worker.js /nomad/service-worker.js break;
}
}
env.js: |
......
......@@ -58,11 +58,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
{{ if .Value.postgres.password_secret }}
{{ if .Values.postgres.password_secret }}
- name: NOMAD_REPOSITORY_DB_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Value.postgres.password_secret }}
name: {{ .Values.postgres.password_secret }}
key: password
{{ end }}
command: ["python", "-m", "celery", "worker", "-A", "nomad.processing", "-n", "$(NOMAD_CELERY_NODE_NAME)"]
......
......@@ -19,7 +19,7 @@ postgres:
dbname: 'nomad_staging'
host: 'staging-nomad.esc'
user: 'nomad_fairdi'
password_secret: 'nomad_staging_db_password'
password_secret: 'nomad-staging-repository-password'
uploadurl: 'https://labdev-nomad.rzg.mpg.de/fairdi/nomad/coe/upload'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment