From bfc7665b5ea6539049295488804ba306781bc7d6 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 7 Sep 2020 10:59:55 -0500 Subject: [PATCH] =?UTF-8?q?fix(directory):=20=F0=9F=90=9B=20fix=20connecti?= =?UTF-8?q?on=20string=20env=20var=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.directory | 2 +- docker-compose.yml | 2 -- reverse-proxy/conf.d.dev/filterlists.conf | 2 +- reverse-proxy/conf.d/filterlists.conf | 2 +- .../src/FilterLists.Directory.Api/appsettings.Development.json | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.env.directory b/.env.directory index 6ae2b4d98..76bcc5ba9 100644 --- a/.env.directory +++ b/.env.directory @@ -1,4 +1,4 @@ -DIRECTORY_CONNECTION_STRING=Server=directory-db;Port=5432;Database=filterlists;User Id=filterlists;Password=filterlists; +DIRECTORY_CONNECTION_STRING=Server=directory-db;Database=filterlists;User Id=filterlists;Password=filterlists; DIRECTORY_DB_USER=filterlists DIRECTORY_DB_PASSWORD=filterlists DIRECTORY_DB_DATABASE=filterlists \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 2a9296c92..1ae9c55d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,6 @@ services: - directory-db environment: ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING} - environment: - - ASPNETCORE_URLS=http://+:80 directory-db: image: postgres:alpine diff --git a/reverse-proxy/conf.d.dev/filterlists.conf b/reverse-proxy/conf.d.dev/filterlists.conf index 94c0a6eba..b65dc90b5 100644 --- a/reverse-proxy/conf.d.dev/filterlists.conf +++ b/reverse-proxy/conf.d.dev/filterlists.conf @@ -3,7 +3,7 @@ server { location ^~ /api { rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://directory-api:80; + proxy_pass http://directory-api:5000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/reverse-proxy/conf.d/filterlists.conf b/reverse-proxy/conf.d/filterlists.conf index 8f7799669..cc82e7da3 100644 --- a/reverse-proxy/conf.d/filterlists.conf +++ b/reverse-proxy/conf.d/filterlists.conf @@ -11,7 +11,7 @@ server { location ^~ /api { rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://directory-api:80; + proxy_pass http://directory-api:5000; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json b/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json index a2a828950..cd39116f6 100644 --- a/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json +++ b/services/directory/src/FilterLists.Directory.Api/appsettings.Development.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "DirectoryConnection": "Server=directory-db;Port=5432;Database=filterlists;User Id=filterlists;Password=filterlists;" + "DirectoryConnection": "Server=directory-db;Database=filterlists;User Id=filterlists;Password=filterlists;" } }