From 49446fdbe9f36e92b541c235ea77f6f05a8367a4 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 9 Jan 2020 11:36:00 -0500
Subject: [PATCH] uWSGI plugin config changes.

uWGI was generating warnings about being unable to find plugin files we
specify. To fix this, I've added uwsgi-python3 to the list of Alpine
packages we install in the container specified the plugins directory in
the uWSGI config. The updated uWSGI ConfigMap has been applied to the
staging cluster, which eliminated the warning about the logfile plugin.
The remaining warning about the python3 plugin will be eliminated once
the new container built by this branch is deployed.
---
 Dockerfile                    | 3 ++-
 deploy/azure/uwsgi-config.yml | 1 +
 uwsgi.ini                     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1785b5d8..6f29d300 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,7 +73,8 @@ RUN apk update && \
       postgresql-client \
       postgresql-dev \
       postgresql-libs \
-      uwsgi-logfile
+      uwsgi-logfile \
+      uwsgi-python3
 
 COPY --from=builder /install/.venv/ ./.venv/
 COPY --from=builder /install/alembic/ ./alembic/
diff --git a/deploy/azure/uwsgi-config.yml b/deploy/azure/uwsgi-config.yml
index 553ea973..0c239637 100644
--- a/deploy/azure/uwsgi-config.yml
+++ b/deploy/azure/uwsgi-config.yml
@@ -10,6 +10,7 @@ data:
     callable = app
     module = app
     socket = /var/run/uwsgi/uwsgi.socket
+    plugins-dir = /usr/lib/uwsgi
     plugin = python3
     plugin = logfile
     virtualenv = /opt/atat/atst/.venv
diff --git a/uwsgi.ini b/uwsgi.ini
index e1b9f912..9e0467be 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -2,6 +2,7 @@
 callable = app
 module = app
 socket = /var/run/uwsgi/uwsgi.socket
+plugins-dir = /usr/lib/uwsgi
 plugin = python3
 plugin = logfile
 virtualenv = /opt/atat/atst/.venv