From 9ddd58554c0adb467a8ce65cfc7222e8133a66ce Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 25 Aug 2020 04:41:47 -0500
Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=94=A8=20only=20use=20reverse-pr?=
 =?UTF-8?q?oxy=20on=20prod=20to=20allow=20VS=20to=20debug=20directly=20int?=
 =?UTF-8?q?o=20dotnet=20containers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.override.yml               |  8 ++-----
 docker-compose.prod.yml                   |  7 ++++++
 docker-compose.yml                        | 10 ---------
 reverse-proxy/conf.d.dev/filterlists.conf | 26 -----------------------
 4 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 reverse-proxy/conf.d.dev/filterlists.conf

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 140998f08..d8b3f04d6 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -3,15 +3,11 @@
 version: "3.8"
 
 services:
-  filterlists.reverse_proxy:
-    ports:
-      - "80:80"
-    volumes:
-      - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
-
   filterlists.directory.api:
     build:
       dockerfile: directory/src/FilterLists.Directory.Api/debug.Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://+:80
+    ports:
+      - "80"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d9a87fb81..5181f6561 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -4,9 +4,16 @@ version: "3.8"
 
 services:
   filterlists.reverse_proxy:
+    image: nginx:alpine
     ports:
       - "443:443"
+    networks:
+      - reverse_proxy
+    depends_on:
+      - filterlists.web
+      - filterlists.directory.api
     volumes:
+      - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
       - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7afb116fa..0db3c9fcb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,6 @@
 version: "3.8"
 
 services:
-  filterlists.reverse_proxy:
-    image: nginx:alpine
-    networks:
-      - reverse_proxy
-    depends_on:
-      - filterlists.web
-      - filterlists.directory.api
-    volumes:
-      - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
-
   filterlists.web:
     image: ${DOCKER_REGISTRY-}filterlists_web
     build:
diff --git a/reverse-proxy/conf.d.dev/filterlists.conf b/reverse-proxy/conf.d.dev/filterlists.conf
deleted file mode 100644
index fcf9cea02..000000000
--- a/reverse-proxy/conf.d.dev/filterlists.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-server {
-  listen 80 default_server;
-  
-  location ^~ /api {
-    rewrite ^/api/(.*)$ /$1 break;
-    proxy_pass         http://filterlists.directory.api:80;
-    proxy_http_version 1.1;
-    proxy_set_header   Upgrade $http_upgrade;
-    proxy_set_header   Connection keep-alive;
-    proxy_set_header   Host $host;
-    proxy_cache_bypass $http_upgrade;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Forwarded-Proto $scheme;
-  }
-
-  location / {
-    proxy_pass         http://filterlists.web:80;
-    proxy_http_version 1.1;
-    proxy_set_header   Upgrade $http_upgrade;
-    proxy_set_header   Connection keep-alive;
-    proxy_set_header   Host $host;
-    proxy_cache_bypass $http_upgrade;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Forwarded-Proto $scheme;
-  }
-}
\ No newline at end of file