From 2087681506a5b35fd458eda156148f2b5418209c Mon Sep 17 00:00:00 2001
From: Spyros Garyfallos <paloukari@hotmail.com>
Date: Mon, 16 Jul 2018 15:38:10 -0700
Subject: [PATCH] hub server certificate config issue

---
 TypeEdge.Host/.nuspec                | 4 ++--
 TypeEdge.Host/TypeEdgeHost.cs        | 6 +++++-
 TypeEdge.Proxy/TypeEdge.Proxy.csproj | 2 +-
 TypeEdge/TypeEdge.csproj             | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/TypeEdge.Host/.nuspec b/TypeEdge.Host/.nuspec
index 03b715e..9e94693 100644
--- a/TypeEdge.Host/.nuspec
+++ b/TypeEdge.Host/.nuspec
@@ -2,14 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>TypeEdge.Host</id>
-    <version>0.2.2</version>
+    <version>0.2.3</version>
     <authors>paloukari</authors>
     <owners>paloukari</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Package Description</description>
     <dependencies>
       <group targetFramework=".NETCoreApp2.1">
-        <dependency id="TypeEdge" version="0.2.2" exclude="Build,Analyzers" />
+        <dependency id="TypeEdge" version="0.2.3" exclude="Build,Analyzers" />
         <dependency id="Serilog.Extensions.Logging" version="1.4.0" exclude="Build,Analyzers" />
         <dependency id="Serilog.Sinks.Console" version="2.1.0" exclude="Build,Analyzers" />
         <dependency id="Microsoft.Extensions.DependencyInjection" version="2.1.1" exclude="Build,Analyzers" />
diff --git a/TypeEdge.Host/TypeEdgeHost.cs b/TypeEdge.Host/TypeEdgeHost.cs
index 6068ba7..bf11d40 100644
--- a/TypeEdge.Host/TypeEdgeHost.cs
+++ b/TypeEdge.Host/TypeEdgeHost.cs
@@ -173,12 +173,16 @@ namespace TypeEdge.Host
             //Calculate the Hub Enviroment Varialbes
             var currentLocation = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
 
+            Environment.SetEnvironmentVariable(HubService.Constants.EdgeHubServerCertificateFileKey,
+                Path.Combine(currentLocation, @"Certificates/edge-hub-server/cert/edge-hub-server.cert.pfx"));
+
             Environment.SetEnvironmentVariable(HubService.Constants.SslCertEnvName,
                 "edge-hub-server.cert.pfx");
+
             Environment.SetEnvironmentVariable(HubService.Constants.SslCertPathEnvName,
                 Path.Combine(currentLocation, @"Certificates/edge-hub-server/cert"));
 
-            Environment.SetEnvironmentVariable("EdgeModuleHubServerCAChainCertificateFile",
+            Environment.SetEnvironmentVariable(HubService.Constants.EdgeHubServerCAChainCertificateFileKey,
                 Path.Combine(currentLocation, @"Certificates/edge-chain-ca/cert/edge-chain-ca.cert.pem"));
 
             var storageFolder = Path.Combine(currentLocation, @"Storage");
diff --git a/TypeEdge.Proxy/TypeEdge.Proxy.csproj b/TypeEdge.Proxy/TypeEdge.Proxy.csproj
index dd9df10..42006cb 100644
--- a/TypeEdge.Proxy/TypeEdge.Proxy.csproj
+++ b/TypeEdge.Proxy/TypeEdge.Proxy.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <PackageId>TypeEdge.Proxy</PackageId>
-    <Version>0.2.2</Version>
+    <Version>0.2.3</Version>
     <Authors>paloukari</Authors>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/TypeEdge/TypeEdge.csproj b/TypeEdge/TypeEdge.csproj
index 00b3b4b..65cf4c4 100644
--- a/TypeEdge/TypeEdge.csproj
+++ b/TypeEdge/TypeEdge.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <PackageId>TypeEdge</PackageId>
-    <Version>0.2.2</Version>
+    <Version>0.2.3</Version>
     <Authors>paloukari</Authors>
     <PackageOutputPath>../../TypeEdgeNuGets</PackageOutputPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>