From db410f11d6681ed6d79eb47d8b0f2c63f3f9107a Mon Sep 17 00:00:00 2001
From: Marcel Hilgersom <mhilgersom@artsenzorg.nl>
Date: Mon, 11 Feb 2019 21:32:36 +0100
Subject: [PATCH 1/3] Make orleans port configurable

---
 src/Squidex/Config/Orleans/OrleansServices.cs | 5 ++++-
 src/Squidex/appsettings.json                  | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs
index 352611909..be633366f 100644
--- a/src/Squidex/Config/Orleans/OrleansServices.cs
+++ b/src/Squidex/Config/Orleans/OrleansServices.cs
@@ -58,7 +58,10 @@ namespace Squidex.Config.Orleans
             {
                 ["MongoDB"] = () =>
                 {
-                    hostBuilder.ConfigureEndpoints(Dns.GetHostName(), 11111, 40000, listenOnAnyHostAddress: true);
+                    var siloPort = int.Parse(config.GetRequiredValue("orleans:siloPort") ?? "11111");
+                    var gatewayPort = int.Parse(config.GetRequiredValue("orleans:gatewayPort") ?? "400000");
+
+                    hostBuilder.ConfigureEndpoints(Dns.GetHostName(), siloPort, gatewayPort, listenOnAnyHostAddress: true);
 
                     var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration");
                     var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database");
diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json
index 14e289162..b7bccef40 100644
--- a/src/Squidex/appsettings.json
+++ b/src/Squidex/appsettings.json
@@ -177,7 +177,9 @@
      * 
      * Supported: MongoDB, Development
      */
-    "clustering": "MongoDb"
+    "clustering": "MongoDb",
+    "siloPort": 11112,
+    "gatewayPort":  40002 
   },
 
   "eventStore": {

From 97d494d54d05c4a38c796b8d9e436e14c4c00cc9 Mon Sep 17 00:00:00 2001
From: Marcel Hilgersom <mhilgersom@artsenzorg.nl>
Date: Tue, 12 Feb 2019 12:14:07 +0100
Subject: [PATCH 2/3] Get orleans port config from environmentvariables

---
 src/Squidex/Config/Orleans/OrleansServices.cs | 4 ++--
 src/Squidex/appsettings.json                  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs
index de6cf2174..c4e2ae7fc 100644
--- a/src/Squidex/Config/Orleans/OrleansServices.cs
+++ b/src/Squidex/Config/Orleans/OrleansServices.cs
@@ -58,8 +58,8 @@ namespace Squidex.Config.Orleans
             {
                 ["MongoDB"] = () =>
                 {
-                    var siloPort = int.Parse(config.GetRequiredValue("orleans:siloPort") ?? "11111");
-                    var gatewayPort = int.Parse(config.GetRequiredValue("orleans:gatewayPort") ?? "400000");
+                    var siloPort = int.Parse(Environment.GetEnvironmentVariable("Orleans.SiloPort") ?? "11111");
+                    var gatewayPort = int.Parse(Environment.GetEnvironmentVariable("Orleans.GatewayPort") ?? "40000");
 
                     hostBuilder.ConfigureEndpoints(Dns.GetHostName(), siloPort, gatewayPort, listenOnAnyHostAddress: true);
 
diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json
index b7bccef40..14e289162 100644
--- a/src/Squidex/appsettings.json
+++ b/src/Squidex/appsettings.json
@@ -177,9 +177,7 @@
      * 
      * Supported: MongoDB, Development
      */
-    "clustering": "MongoDb",
-    "siloPort": 11112,
-    "gatewayPort":  40002 
+    "clustering": "MongoDb"
   },
 
   "eventStore": {

From 2672bc81c214e33f21ebbe8056c981656807cce1 Mon Sep 17 00:00:00 2001
From: Marcel Hilgersom <mhilgersom@artsenzorg.nl>
Date: Wed, 13 Feb 2019 17:11:13 +0100
Subject: [PATCH 3/3] Use config for overriding port numbers

---
 src/Squidex/Config/Orleans/OrleansServices.cs | 4 ++--
 src/Squidex/appsettings.json                  | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs
index c4e2ae7fc..7ef2269c6 100644
--- a/src/Squidex/Config/Orleans/OrleansServices.cs
+++ b/src/Squidex/Config/Orleans/OrleansServices.cs
@@ -58,8 +58,8 @@ namespace Squidex.Config.Orleans
             {
                 ["MongoDB"] = () =>
                 {
-                    var siloPort = int.Parse(Environment.GetEnvironmentVariable("Orleans.SiloPort") ?? "11111");
-                    var gatewayPort = int.Parse(Environment.GetEnvironmentVariable("Orleans.GatewayPort") ?? "40000");
+                    int siloPort = int.TryParse(config.GetRequiredValue("orleans:siloPort"), out siloPort) ? siloPort : 11111;
+                    int gatewayPort = int.TryParse(config.GetRequiredValue("orleans:gatewayPort"), out gatewayPort) ? gatewayPort : 40000;
 
                     hostBuilder.ConfigureEndpoints(Dns.GetHostName(), siloPort, gatewayPort, listenOnAnyHostAddress: true);
 
diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json
index 14e289162..b38d719e9 100644
--- a/src/Squidex/appsettings.json
+++ b/src/Squidex/appsettings.json
@@ -177,7 +177,13 @@
      * 
      * Supported: MongoDB, Development
      */
-    "clustering": "MongoDb"
+    "clustering": "MongoDb",
+    /*
+     * The ports used to host the Orleans silo and the Gateway to connect to it
+     * optional: defaults to 11111 (silo) and 40000 (gateway) when not provided
+     */
+    "siloPort": "11111",
+    "gatewayPort": "40000"
   },
 
   "eventStore": {