From 30ea8b728d7c9ca7759a550742b9e740fc0ff864 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Thu, 1 Jul 2021 12:11:02 -0400 Subject: [PATCH] Split dev env settings to development settings file (#1424) * Move dev urls to appsettings.Development.json * Move bitwarden license dev urls --- .../src/Portal/appsettings.Development.json | 20 +++++++++++++++++++ bitwarden_license/src/Portal/appsettings.json | 16 --------------- .../src/Sso/appsettings.Development.json | 20 +++++++++++++++++++ bitwarden_license/src/Sso/appsettings.json | 16 --------------- src/Admin/appsettings.Development.json | 4 ++++ src/Admin/appsettings.json | 3 +-- src/Api/appsettings.Development.json | 8 ++++++++ src/Api/appsettings.json | 6 ++---- 8 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 bitwarden_license/src/Portal/appsettings.Development.json create mode 100644 bitwarden_license/src/Sso/appsettings.Development.json diff --git a/bitwarden_license/src/Portal/appsettings.Development.json b/bitwarden_license/src/Portal/appsettings.Development.json new file mode 100644 index 000000000..ce27476b0 --- /dev/null +++ b/bitwarden_license/src/Portal/appsettings.Development.json @@ -0,0 +1,20 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://localhost:8080", + "api": "http://localhost:4000", + "identity": "http://localhost:33656", + "admin": "http://localhost:62911", + "notifications": "http://localhost:61840", + "sso": "http://localhost:51822", + "portal": "http://localhost:52313", + "internalNotifications": "http://localhost:61840", + "internalAdmin": "http://localhost:62911", + "internalIdentity": "http://localhost:33656", + "internalApi": "http://localhost:4000", + "internalVault": "http://localhost:4001", + "internalSso": "http://localhost:51822", + "internalPortal": "http://localhost:52313" + } + } +} diff --git a/bitwarden_license/src/Portal/appsettings.json b/bitwarden_license/src/Portal/appsettings.json index 4733d1e65..9d06f4baa 100644 --- a/bitwarden_license/src/Portal/appsettings.json +++ b/bitwarden_license/src/Portal/appsettings.json @@ -4,22 +4,6 @@ "siteName": "Bitwarden", "projectName": "Business Portal", "stripeApiKey": "SECRET", - "baseServiceUri": { - "vault": "https://localhost:8080", - "api": "http://localhost:4000", - "identity": "http://localhost:33656", - "admin": "http://localhost:62911", - "notifications": "http://localhost:61840", - "sso": "http://localhost:51822", - "portal": "http://localhost:52313", - "internalNotifications": "http://localhost:61840", - "internalAdmin": "http://localhost:62911", - "internalIdentity": "http://localhost:33656", - "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", - "internalSso": "http://localhost:51822", - "internalPortal": "http://localhost:52313" - }, "sqlServer": { "connectionString": "SECRET" }, diff --git a/bitwarden_license/src/Sso/appsettings.Development.json b/bitwarden_license/src/Sso/appsettings.Development.json new file mode 100644 index 000000000..ce27476b0 --- /dev/null +++ b/bitwarden_license/src/Sso/appsettings.Development.json @@ -0,0 +1,20 @@ +{ + "globalSettings": { + "baseServiceUri": { + "vault": "https://localhost:8080", + "api": "http://localhost:4000", + "identity": "http://localhost:33656", + "admin": "http://localhost:62911", + "notifications": "http://localhost:61840", + "sso": "http://localhost:51822", + "portal": "http://localhost:52313", + "internalNotifications": "http://localhost:61840", + "internalAdmin": "http://localhost:62911", + "internalIdentity": "http://localhost:33656", + "internalApi": "http://localhost:4000", + "internalVault": "http://localhost:4001", + "internalSso": "http://localhost:51822", + "internalPortal": "http://localhost:52313" + } + } +} diff --git a/bitwarden_license/src/Sso/appsettings.json b/bitwarden_license/src/Sso/appsettings.json index 9bcc8382d..7e1d1be5e 100644 --- a/bitwarden_license/src/Sso/appsettings.json +++ b/bitwarden_license/src/Sso/appsettings.json @@ -5,22 +5,6 @@ "projectName": "SSO", "stripeApiKey": "SECRET", "oidcIdentityClientKey": "SECRET", - "baseServiceUri": { - "vault": "https://localhost:8080", - "api": "http://localhost:4000", - "identity": "http://localhost:33656", - "admin": "http://localhost:62911", - "notifications": "http://localhost:61840", - "sso": "http://localhost:51822", - "portal": "http://localhost:52313", - "internalNotifications": "http://localhost:61840", - "internalAdmin": "http://localhost:62911", - "internalIdentity": "http://localhost:33656", - "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", - "internalSso": "http://localhost:51822", - "internalPortal": "http://localhost:52313" - }, "sqlServer": { "connectionString": "SECRET" }, diff --git a/src/Admin/appsettings.Development.json b/src/Admin/appsettings.Development.json index ce27476b0..7c401fe6f 100644 --- a/src/Admin/appsettings.Development.json +++ b/src/Admin/appsettings.Development.json @@ -15,6 +15,10 @@ "internalVault": "http://localhost:4001", "internalSso": "http://localhost:51822", "internalPortal": "http://localhost:52313" + }, + "send": { + "connectionString": "SECRET", + "baseUrl": "http://localhost:4000/sendfiles/" } } } diff --git a/src/Admin/appsettings.json b/src/Admin/appsettings.json index ec7859ba4..728a298b5 100644 --- a/src/Admin/appsettings.json +++ b/src/Admin/appsettings.json @@ -42,8 +42,7 @@ "region": "SECRET" }, "send": { - "connectionString": "SECRET", - "baseUrl": "http://localhost:4000/sendfiles/" + "connectionString": "SECRET" } }, "adminSettings": { diff --git a/src/Api/appsettings.Development.json b/src/Api/appsettings.Development.json index ce27476b0..67557db08 100644 --- a/src/Api/appsettings.Development.json +++ b/src/Api/appsettings.Development.json @@ -15,6 +15,14 @@ "internalVault": "http://localhost:4001", "internalSso": "http://localhost:51822", "internalPortal": "http://localhost:52313" + }, + "attachment": { + "connectionString": "SECRET", + "baseUrl": "http://localhost:4000/attachments/" + }, + "send": { + "connectionString": "SECRET", + "baseUrl": "http://localhost:4000/sendfiles/" } } } diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json index 2ca9cd5b0..8a2d67665 100644 --- a/src/Api/appsettings.json +++ b/src/Api/appsettings.json @@ -25,12 +25,10 @@ "connectionString": "SECRET" }, "attachment": { - "connectionString": "SECRET", - "baseUrl": "http://localhost:4000/attachments/" + "connectionString": "SECRET" }, "send": { - "connectionString": "SECRET", - "baseUrl": "http://localhost:4000/sendfiles/" + "connectionString": "SECRET" }, "documentDb": { "uri": "SECRET",