Allow installer to work when port 80 is blocked and up version

FOGProject · Feb 14, 2018 · b17dd41 · b17dd41
1 parent 77eee65
commit b17dd41
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/MSI/Product.wxs b/MSI/Product.wxs
@@ -20,14 +20,14 @@
 -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
-  <Product Id="*" Name="FOG Service" Language="1033" Version="0.11.13" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
+  <Product Id="*" Name="FOG Service" Language="1033" Version="0.11.14" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
            Manufacturer="FOG">
     <Package Description="FOG Service" Comments="A client for the FOG project" InstallerVersion="300" Compressed="yes"
              InstallScope="perMachine" />
     <!-- Remove old versions -->
     <Upgrade Id="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA">
       <UpgradeVersion OnlyDetect="yes" Minimum="0.0.0" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
-      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.11.12" Property="OLDERVERSIONBEINGUPGRADED"
+      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.11.13" Property="OLDERVERSIONBEINGUPGRADED"
                       IncludeMinimum="no" IncludeMaximum="yes" MigrateFeatures="yes" />
     </Upgrade>
     <InstallExecuteSequence>

diff --git a/SetupHelper/CustomAction.cs b/SetupHelper/CustomAction.cs
@@ -41,7 +41,8 @@ public static ActionResult InstallCert(Session session)
         {
             try
             {
-                if (GenericSetup.PinServerCert(session.CustomActionData["sWEBADDRESS"], 
+                if (GenericSetup.PinServerCert(session.CustomActionData["sHTTPS"],
+                    session.CustomActionData["sWEBADDRESS"], 
                     session.CustomActionData["sWEBROOT"], 
                     session.CustomActionData["sINSTALLDIR"]))
                 {

diff --git a/SetupHelper/GenericSetup.cs b/SetupHelper/GenericSetup.cs
@@ -38,14 +38,14 @@ public static bool PinServerCert(string location, bool presetSettings = false)
                 Settings.SetPath(Path.Combine(location, "settings.json"));
 
             Configuration.GetAndSetServerAddress();
-            Configuration.ServerAddress = Configuration.ServerAddress.Replace("https://", "http://");
 
             return PinServerCertPreset(location);
         }
 
-        public static bool PinServerCert(string address, string webroot, string location)
+        public static bool PinServerCert(string https, string address, string webroot, string location)
         {
-            Configuration.ServerAddress = "http://" + address + webroot;
+            var useHTTPS = (https == "1");
+            Configuration.ServerAddress = ((useHTTPS) ? "https://" : "http://") + address + webroot;
             return PinServerCertPreset(location);
         }
 

diff --git a/UniversalInstaller/Helper.cs b/UniversalInstaller/Helper.cs
@@ -28,7 +28,7 @@ namespace FOG
     public static class Helper
     {
         private const string LogName = "Installer";
-        public const string ClientVersion = "0.11.13";
+        public const string ClientVersion = "0.11.14";
 
         public static IInstall Instance { get;  }