diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini index 42e8a88f4..1ec38bfd6 100644 --- a/docker/uwsgi.ini +++ b/docker/uwsgi.ini @@ -3,6 +3,7 @@ http = 0.0.0.0:8000 chdir = /app wsgi-file = passbook/root/wsgi.py processes = 4 +master = true threads = 2 enable-threads = true uid = passbook diff --git a/helm/passbook/templates/web-deployment.yaml b/helm/passbook/templates/web-deployment.yaml index 25f31210c..549dd3772 100644 --- a/helm/passbook/templates/web-deployment.yaml +++ b/helm/passbook/templates/web-deployment.yaml @@ -20,10 +20,6 @@ spec: app.kubernetes.io/instance: {{ .Release.Name }} passbook.io/component: web spec: - volumes: - - name: config-volume - configMap: - name: {{ include "passbook.fullname" . }}-config initContainers: - name: passbook-database-migrations image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}" @@ -46,9 +42,6 @@ spec: secretKeyRef: name: "{{ .Release.Name }}-postgresql" key: postgresql-password - volumeMounts: - - mountPath: /etc/passbook - name: config-volume containers: - name: {{ .Chart.Name }} image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}" @@ -76,9 +69,6 @@ spec: - name: http containerPort: 8000 protocol: TCP - volumeMounts: - - mountPath: /etc/passbook - name: config-volume livenessProbe: httpGet: path: / diff --git a/helm/passbook/templates/worker-deployment.yaml b/helm/passbook/templates/worker-deployment.yaml index 409fc757d..68bbd0e3c 100644 --- a/helm/passbook/templates/worker-deployment.yaml +++ b/helm/passbook/templates/worker-deployment.yaml @@ -20,10 +20,6 @@ spec: app.kubernetes.io/instance: {{ .Release.Name }} passbook.io/component: worker spec: - volumes: - - name: config-volume - configMap: - name: {{ include "passbook.fullname" . }}-config containers: - name: {{ .Chart.Name }} image: "docker.beryju.org/passbook/server:{{ .Values.image.tag }}" @@ -51,13 +47,6 @@ spec: secretKeyRef: name: "{{ .Release.Name }}-postgresql" key: postgresql-password - ports: - - name: http - containerPort: 8000 - protocol: TCP - volumeMounts: - - mountPath: /etc/passbook - name: config-volume resources: requests: cpu: 150m diff --git a/passbook/root/settings.py b/passbook/root/settings.py index a8455198b..272defc27 100644 --- a/passbook/root/settings.py +++ b/passbook/root/settings.py @@ -253,7 +253,6 @@ with CONFIG.cd('log'): 'grpc': 'DEBUG', 'oauthlib': 'DEBUG', 'oauth2_provider': 'DEBUG', - 'daphne': 'INFO', } LOGGING = { 'version': 1,