From a353c9142003477a9bc24e9558c7782954d13b9d Mon Sep 17 00:00:00 2001
From: Brady Holt <brady.holt@gmail.com>
Date: Thu, 25 May 2017 11:05:01 -0500
Subject: [PATCH] =?UTF-8?q?Add=20serverBindingUrl=20to=20appSettings.json;?=
 =?UTF-8?q?=20rename=20=E2=80=9Curl=E2=80=9D=20>=20=E2=80=9CfrontEndUrl?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/Program.cs                  | 7 ++++++-
 api/Startup.cs                  | 2 +-
 api/api.csproj                  | 5 ++++-
 api/appsettings.json            | 3 ++-
 ops/roles/deploy/tasks/main.yml | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/api/Program.cs b/api/Program.cs
index 67ebb58..e05c699 100755
--- a/api/Program.cs
+++ b/api/Program.cs
@@ -10,9 +10,14 @@ public class Program
     {
         public static void Main(string[] args)
         {
+          var config = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .Build();
+
             var host = new WebHostBuilder()
                 .UseKestrel()
-                .UseUrls($"http://0.0.0.0:5000")
+                .UseUrls(config["serverBindingUrl"])
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseStartup<Startup>()
                 .Build();
diff --git a/api/Startup.cs b/api/Startup.cs
index 3195b7e..07d100f 100644
--- a/api/Startup.cs
+++ b/api/Startup.cs
@@ -164,7 +164,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 AutomaticChallenge = true,
                 RequireHttpsMetadata = false,
                 Audience = "resource-server",
-                Authority = Configuration["url"]
+                Authority = Configuration["frontEndUrl"]
             });
 
             app.UseOpenIddict();
diff --git a/api/api.csproj b/api/api.csproj
index a4f3a98..b2e1bfc 100755
--- a/api/api.csproj
+++ b/api/api.csproj
@@ -10,6 +10,9 @@
     <None Update="wwwroot\**\*;Views;Areas\**\Views">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </None>
+    <None Update="appsettings.json">
+       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MailKit" Version="1.14.2" />
@@ -39,4 +42,4 @@
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/api/appsettings.json b/api/appsettings.json
index 2607802..d119085 100644
--- a/api/appsettings.json
+++ b/api/appsettings.json
@@ -2,7 +2,8 @@
   "connectionStrings": {
     "defaultConnection": "Host=localhost;Port=5433;Username=postgres;Password=postgres;Database=dotnetcore"
   },
-  "url": "http://localhost:5000",
+  "frontEndUrl": "http://localhost:5000",
+  "serverBindingUrl": "http://0.0.0.0:5000",
   "logging": {
     "includeScopes": false,
     "logLevel": {
diff --git a/ops/roles/deploy/tasks/main.yml b/ops/roles/deploy/tasks/main.yml
index 79fa961..654f1ac 100644
--- a/ops/roles/deploy/tasks/main.yml
+++ b/ops/roles/deploy/tasks/main.yml
@@ -28,6 +28,6 @@
 
 - name: Configure app url
   lineinfile: dest="{{ deploy_directory }}/{{ appsetting_file }}"
-    regexp="url\":"
-    line="\"url\"{{':'}} \"http://{{webserver_name}}/\","
+    regexp="frontEndUrl\":"
+    line="\"frontEndUrl\"{{':'}} \"http://{{webserver_name}}/\","
     state="present"