fix(reverse-proxy): 🐛🚑 fix location vs server includes

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;"]
 

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
 

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

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/*;
   }
 }

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/*;
   }
 }