From 4d4c873c7398de9a8828b4813d80b912a977f870 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Mon, 25 Nov 2019 11:09:18 -0500
Subject: [PATCH] Enable uwsgi logging again.

Updates the K8s config to enable extended uWSGI JSON logging again. This
commit updates the name of the ConfigMap for the uWSGI config to avoid
confusion.
---
 deploy/azure/azure.yml                                | 6 ++++++
 deploy/azure/kustomization.yaml                       | 2 +-
 deploy/azure/{atst-configmap.yml => uwsgi-config.yml} | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename deploy/azure/{atst-configmap.yml => uwsgi-config.yml} (94%)

diff --git a/deploy/azure/azure.yml b/deploy/azure/azure.yml
index b22a9cb4..d7b59f5a 100644
--- a/deploy/azure/azure.yml
+++ b/deploy/azure/azure.yml
@@ -46,6 +46,8 @@ spec:
             - name: pgsslrootcert
               mountPath: "/opt/atat/atst/ssl/pgsslrootcert.crt"
               subPath: pgsslrootcert.crt
+            - name: uwsgi-config
+              mountPath: "/opt/atat/atst/"
         - name: nginx
           image: nginx:alpine
           ports:
@@ -124,6 +126,10 @@ spec:
           configMap:
             name: acme-challenges
             defaultMode: 0666
+        - name: uwsgi-config
+          configMap:
+            name: uwsgi-config
+            defaultMode: 0666
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
diff --git a/deploy/azure/kustomization.yaml b/deploy/azure/kustomization.yaml
index 24ce6863..1ccd188b 100644
--- a/deploy/azure/kustomization.yaml
+++ b/deploy/azure/kustomization.yaml
@@ -1,7 +1,7 @@
 namespace: atat
 resources:
   - azure.yml
-  - atst-configmap.yml
+  - uwsgi-config.yml
   - atst-envvars-configmap.yml
   - atst-nginx-configmap.yml
   - atst-worker-envvars-configmap.yml
diff --git a/deploy/azure/atst-configmap.yml b/deploy/azure/uwsgi-config.yml
similarity index 94%
rename from deploy/azure/atst-configmap.yml
rename to deploy/azure/uwsgi-config.yml
index 79f9a61b..553ea973 100644
--- a/deploy/azure/atst-configmap.yml
+++ b/deploy/azure/uwsgi-config.yml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: atst-config
+  name: uwsgi-config
   namespace: atat
 data:
-  uwsgi-config: |-
+  uwsgi.ini: |-
     [uwsgi]
     callable = app
     module = app
@@ -14,6 +14,7 @@ data:
     plugin = logfile
     virtualenv = /opt/atat/atst/.venv
     chmod-socket = 666
+    chown-socket = atst:atat
 
     ; logger config