Merge branch 'cazac9-master'

Author: renemadsen

eFormAPI/Installation/CustomActions/CustomAction.cs

@@ -235,11 +235,12 @@ public static ActionResult InstallCA(Session session)
                 if (session.CustomActionData["GENERATESSL"] == "1")
                 {
                     var siteId = GetSiteId(uiName);
-                    RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --accepttos --usedefaulttaskuser");
+                    var email = session.CustomActionData["EMAIL"];
+                    RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --emailaddress { email } --accepttos --usedefaulttaskuser");
                 }
 
-                CongigureSecurity(clientLocation);
-                CongigureSecurity(webApiLocation);
+                ConfigureSecurity(clientLocation);
+                ConfigureSecurity(webApiLocation);
                 //DeleteDirectory(Path.Combine(installFolder, "letsencrypt"));
                 IncrementProgressBar(session);
 
@@ -348,8 +349,8 @@ public static ActionResult UpdateCA(Session session)
                 ControlSites(customerNumber, domain, apiPort, uiPort, true);
                 IncrementProgressBar(session);
 
-                CongigureSecurity(uiIisDir);
-                CongigureSecurity(webApiLocation);
+                ConfigureSecurity(uiIisDir);
+                ConfigureSecurity(webApiLocation);
 
                 DeleteDirectory(apiTemp);
                 DeleteDirectory(clientTemp);
@@ -510,7 +511,7 @@ private static void RenameFolders(string location, string apiName, string uiName
             DeleteDirectory(Path.Combine(location, "eform-client"));
         }
 
-        public static void CongigureSecurity(string folder)
+        public static void ConfigureSecurity(string folder)
         {
             using (var powershell = PowerShell.Create())
             {

eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs

@@ -9,10 +9,19 @@
                 <Control Type="Edit" Id="CustomerNumber" Width="220" Height="15" X="45" Y="132" Property="CUSTOMERNUMBER" Text="{80}" />
 
                 <Control Type="CheckBox" Id="certgen" Property="GENERATESSL" Width="215" Height="17" X="45" Y="165" CheckBoxValue="1" Text="Generate SSL certificate" />
+
+                <Control Id="EmailText" Type="Text" X="45" Y="182" Width="220" Height="15" Text ="&amp;Email address:">
+                  <Condition Action="show" >GENERATESSL</Condition> 
+                  <Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
+                </Control>
+              <Control Id="EmailBox" Type="Edit" X="45" Y="196" Width="220" Height="15" Property="EMAIL" Text="{80}">
+                <Condition Action="show" >GENERATESSL</Condition>
+                <Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
+              </Control>
 
                 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back" />
                 <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&amp;Next">
-                    <Publish Event="SpawnDialog" Value="EmptyFieldDlg">NOT DOMAINNAME OR NOT CUSTOMERNUMBER</Publish>
+                    <Publish Event="SpawnDialog" Value="EmptyFieldDlg">(NOT DOMAINNAME OR NOT CUSTOMERNUMBER) OR (GENERATESSL AND NOT EMAIL)</Publish>
                 </Control>
                 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
                     <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>

eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs

@@ -13,6 +13,7 @@
           <Publish Property="DOMAINNAME" Value="{}" >1</Publish>
           <Publish Property="CUSTOMERNUMBER" Value="{}" >1</Publish>
           <Publish Property="GENERATESSL" Value="{}" >1</Publish>
+          <Publish Property="EMAIL" Value="{}" >1</Publish> 
           <Publish Property="CONFIGURATIONEXISTS" Value="{}" >1</Publish>
         </Control>
         <Control Id="Update" Type="PushButton" X="98" Y="139" Width="139" Height="33" Text="&amp;Update" >

eFormAPI/Installation/MainInstaller/Product.wxs

@@ -38,6 +38,7 @@
     <Property Id="DOMAINNAME" Value="{}" Secure="yes" />
     <Property Id="CUSTOMERNUMBER" Value="{}" Secure="yes" />
     <Property Id="GENERATESSL" Value="{}" Secure="yes" />
+    <Property Id="EMAIL" Value="{}" Secure="yes" />
     <Property Id="INSTALLFOLDER" Value="C:\inetpub\wwwroot" Secure="yes" />
     <Property Id="KEEPFOLDERS" Value="eform-api\output" Secure="yes"/>
     <Property Id="KEEPSETTINGS" Value="1" Secure="yes"/>
@@ -70,7 +71,7 @@
 
     <Binary Id="BinaryCA" SourceFile="BuildedCustomActions\CustomActions.CA.dll" />
 
-    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER];USEEXISTINGCONFIGURATION=[USEEXISTINGCONFIGURATION];CONFIGURATIONEXISTS=[CONFIGURATIONEXISTS];KEEPFOLDERS=[KEEPFOLDERS];KEEPFILES=[KEEPFILES]"/>
+    <CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER];USEEXISTINGCONFIGURATION=[USEEXISTINGCONFIGURATION];CONFIGURATIONEXISTS=[CONFIGURATIONEXISTS];KEEPFOLDERS=[KEEPFOLDERS];KEEPFILES=[KEEPFILES];EMAIL=[EMAIL]"/>
     <CustomAction Id="SetRemoveValues" Property="RemoveService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];KEEPFOLDERS=[KEEPFOLDERS];KEEPSETTINGS=[KEEPSETTINGS];KEEPFILES=[KEEPFILES]" />
     <CustomAction Id="SetUpdateServiceValues" Property="UpdateService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];INSTALLFOLDER=[INSTALLFOLDER]" />