From a0d855e427789a176a9f3d3856d6285ec5b55d3f Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 23 Jan 2021 14:34:55 -0600
Subject: [PATCH] =?UTF-8?q?fix(reverse-proxy):=20=F0=9F=90=9B=F0=9F=9A=91?=
 =?UTF-8?q?=20fix=20location=20vs=20server=20includes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose/docker-compose.override.yml              | 1 +
 docker-compose/docker-compose.prod.yml                  | 1 +
 reverse-proxy/azure-pipelines.yaml                      | 1 +
 reverse-proxy/conf.d.dev/default.conf                   | 3 +++
 reverse-proxy/conf.d/default.conf                       | 4 ++++
 reverse-proxy/{svr-includes => loc-includes}/cors.conf  | 0
 reverse-proxy/{svr-includes => loc-includes}/proxy.conf | 0
 7 files changed, 10 insertions(+)
 rename reverse-proxy/{svr-includes => loc-includes}/cors.conf (100%)
 rename reverse-proxy/{svr-includes => loc-includes}/proxy.conf (100%)

diff --git a/docker-compose/docker-compose.override.yml b/docker-compose/docker-compose.override.yml
index 6eb331b77..255519e2c 100644
--- a/docker-compose/docker-compose.override.yml
+++ b/docker-compose/docker-compose.override.yml
@@ -8,6 +8,7 @@ services:
       - "8080:80"
     volumes:
       - ../reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
+      - ../reverse-proxy/loc-includes:/etc/nginx/loc-includes:ro
       - ../reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
diff --git a/docker-compose/docker-compose.prod.yml b/docker-compose/docker-compose.prod.yml
index a8b8da0ca..c29f8936f 100644
--- a/docker-compose/docker-compose.prod.yml
+++ b/docker-compose/docker-compose.prod.yml
@@ -10,6 +10,7 @@ services:
       - web
     volumes:
       - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
+      - ./reverse-proxy/loc-includes:/etc/nginx/loc-includes:ro
       - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
 
diff --git a/reverse-proxy/azure-pipelines.yaml b/reverse-proxy/azure-pipelines.yaml
index 3c6d9cb6d..d11446490 100644
--- a/reverse-proxy/azure-pipelines.yaml
+++ b/reverse-proxy/azure-pipelines.yaml
@@ -25,6 +25,7 @@ steps:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
         reverse-proxy/svr-includes/*
+        reverse-proxy/loc-includes/*
         reverse-proxy/conf.d/*
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf
index 01188f142..8a12c61ff 100644
--- a/reverse-proxy/conf.d.dev/default.conf
+++ b/reverse-proxy/conf.d.dev/default.conf
@@ -6,15 +6,18 @@ server {
   location ^~ /api/archival/ {
     rewrite ^/api/archival/(.*)$ /$1 break;
     proxy_pass         http://archival-api:80;
+    include loc-includes/*;
   }
 
   location ^~ /api/directory/ {
     rewrite ^/api/directory/(.*)$ /$1 break;
     proxy_pass         http://directory-api:80;
+    include loc-includes/*;
   }
 
   location ^~ /api/ {
     rewrite ^/api/(.*)$ /$1 break;
     proxy_pass         http://api-docs:8080;
+    include loc-includes/*;
   }
 }
\ No newline at end of file
diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf
index fd1a28d15..e8f9186c6 100644
--- a/reverse-proxy/conf.d/default.conf
+++ b/reverse-proxy/conf.d/default.conf
@@ -9,20 +9,24 @@ server {
   location ^~ /api/archival/ {
     rewrite ^/api/archival/(.*)$ /$1 break;
     proxy_pass         http://archival-api:80;
+    include loc-includes/*;
   }
 
   location ^~ /api/directory/ {
     rewrite ^/api/directory/(.*)$ /$1 break;
     proxy_pass         http://directory-api:80;
+    include loc-includes/*;
   }
 
   location ^~ /api/ {
     rewrite ^/api/(.*)$ /$1 break;
     proxy_pass         http://api-docs:8080;
+    include loc-includes/*;
   }
 
   location / {
     proxy_pass         http://web:80;
+    include loc-includes/*;
   }
 }
 
diff --git a/reverse-proxy/svr-includes/cors.conf b/reverse-proxy/loc-includes/cors.conf
similarity index 100%
rename from reverse-proxy/svr-includes/cors.conf
rename to reverse-proxy/loc-includes/cors.conf
diff --git a/reverse-proxy/svr-includes/proxy.conf b/reverse-proxy/loc-includes/proxy.conf
similarity index 100%
rename from reverse-proxy/svr-includes/proxy.conf
rename to reverse-proxy/loc-includes/proxy.conf