Skip to content

Commit c3994dc

Browse files
author
ohumeniuk
committed
added email field
1 parent 5290156 commit c3994dc

File tree

7 files changed

+387
-414
lines changed

7 files changed

+387
-414
lines changed

‎eFormAPI/Installation/CustomActions/CustomAction.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,12 @@ public static ActionResult InstallCA(Session session)
235235
if (session.CustomActionData["GENERATESSL"] == "1")
236236
{
237237
var siteId = GetSiteId(uiName);
238-
RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --accepttos --usedefaulttaskuser");
238+
var email = session.CustomActionData["EMAIL"];
239+
RunProcess(Path.Combine(installFolder, "letsencrypt\\letsencrypt.exe"), $"--plugin iissite --siteid { siteId } --emailaddress { email } --accepttos --usedefaulttaskuser");
239240
}
240241

241-
CongigureSecurity(clientLocation);
242-
CongigureSecurity(webApiLocation);
242+
ConfigureSecurity(clientLocation);
243+
ConfigureSecurity(webApiLocation);
243244
//DeleteDirectory(Path.Combine(installFolder, "letsencrypt"));
244245
IncrementProgressBar(session);
245246

@@ -338,8 +339,8 @@ public static ActionResult UpdateCA(Session session)
338339
ControlSites(customerNumber, domain, apiPort, uiPort, true);
339340
IncrementProgressBar(session);
340341

341-
CongigureSecurity(uiIisDir);
342-
CongigureSecurity(webApiLocation);
342+
ConfigureSecurity(uiIisDir);
343+
ConfigureSecurity(webApiLocation);
343344

344345
DeleteDirectory(apiTemp);
345346
DeleteDirectory(clientTemp);
@@ -500,7 +501,7 @@ private static void RenameFolders(string location, string apiName, string uiName
500501
DeleteDirectory(Path.Combine(location, "eform-client"));
501502
}
502503

503-
public static void CongigureSecurity(string folder)
504+
public static void ConfigureSecurity(string folder)
504505
{
505506
using (var powershell = PowerShell.Create())
506507
{

‎eFormAPI/Installation/MainInstaller/ApiFileList.wxs‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎eFormAPI/Installation/MainInstaller/ClientFileList.wxs‎

Lines changed: 306 additions & 345 deletions
Large diffs are not rendered by default.

‎eFormAPI/Installation/MainInstaller/DomainNameDlg.wxs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,19 @@
99
<Control Type="Edit" Id="CustomerNumber" Width="220" Height="15" X="45" Y="132" Property="CUSTOMERNUMBER" Text="{80}" />
1010

1111
<Control Type="CheckBox" Id="certgen" Property="GENERATESSL" Width="215" Height="17" X="45" Y="165" CheckBoxValue="1" Text="Generate SSL certificate" />
12+
13+
<Control Id="EmailText" Type="Text" X="45" Y="182" Width="220" Height="15" Text ="&amp;Email address:">
14+
<Condition Action="show" >GENERATESSL</Condition>
15+
<Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
16+
</Control>
17+
<Control Id="EmailBox" Type="Edit" X="45" Y="196" Width="220" Height="15" Property="EMAIL" Text="{80}">
18+
<Condition Action="show" >GENERATESSL</Condition>
19+
<Condition Action="hide"><![CDATA[GENERATESSL <> "1"]]></Condition>
20+
</Control>
1221

1322
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back" />
1423
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&amp;Next">
15-
<Publish Event="SpawnDialog" Value="EmptyFieldDlg">NOT DOMAINNAME OR NOT CUSTOMERNUMBER</Publish>
24+
<Publish Event="SpawnDialog" Value="EmptyFieldDlg">(NOT DOMAINNAME OR NOT CUSTOMERNUMBER) OR (GENERATESSL AND NOT EMAIL)</Publish>
1625
</Control>
1726
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
1827
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>

‎eFormAPI/Installation/MainInstaller/LetsEncryptFileList.wxs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
44
<DirectoryRef Id="letsencrypt">
5-
<Component Id="cmp37929E6891052DDFA68A9DB9A506EF23" Guid="{7031E862-C4C4-45F8-82A6-259982820A61}">
5+
<Component Id="cmp37929E6891052DDFA68A9DB9A506EF23" Guid="{74E89F59-FC9B-43A9-9B9B-03C31A17020E}">
66
<File Id="filCBB0FEB6ED66DF8FD26F5CD92EB52EDC" KeyPath="yes" Source="$(var.LetsEncryptPath)\letsencrypt.exe" />
77
</Component>
8-
<Component Id="cmpF8E1942B473BDBF4BBCA336A7033A339" Guid="{8E9E8799-3A48-490D-B261-F675C1B0695F}">
8+
<Component Id="cmpF8E1942B473BDBF4BBCA336A7033A339" Guid="{17AA2091-EA17-4B7C-94EC-9386CCC09536}">
99
<File Id="fil6B25AF281F70B40B78C9120722F3C003" KeyPath="yes" Source="$(var.LetsEncryptPath)\letsencrypt.exe.config" />
1010
</Component>
11-
<Component Id="cmp8457A13039FA483884B987EC7096E674" Guid="{D06BDB9E-F412-437D-A0EC-EC393ECEE6E6}">
11+
<Component Id="cmp8457A13039FA483884B987EC7096E674" Guid="{68FD6B9F-2919-48EE-8BDC-C9E6E5B4232A}">
1212
<File Id="filAC7FEFB67B73C23ED90531988664F6C3" KeyPath="yes" Source="$(var.LetsEncryptPath)\Web_Config.xml" />
1313
</Component>
1414
<Directory Id="dir9BEF3F0BAD9B535A976C48CCF430E928" Name="x64">
15-
<Component Id="cmpF43B6DA48E89D9D85B3540D612271434" Guid="{E93DB203-46FE-4DEE-AE8F-40C66EA6880F}">
15+
<Component Id="cmpF43B6DA48E89D9D85B3540D612271434" Guid="{71E5D85D-EF59-4DB1-80DB-B4AE159E005F}">
1616
<File Id="fil71E5F06A4842045C81C3CEAD9E8FDCEF" KeyPath="yes" Source="$(var.LetsEncryptPath)\x64\libeay32.dll" />
1717
</Component>
18-
<Component Id="cmp24002B1540AB87FA06EEEB2CBAA7BC4C" Guid="{4BB58A2A-C132-470B-9FB4-22275BA66E3A}">
18+
<Component Id="cmp24002B1540AB87FA06EEEB2CBAA7BC4C" Guid="{A96CBE72-4011-4531-A28B-36B67D0E023C}">
1919
<File Id="filB20EA68210622EB7CB07499FAAD3CE79" KeyPath="yes" Source="$(var.LetsEncryptPath)\x64\ssleay32.dll" />
2020
</Component>
2121
</Directory>
2222
<Directory Id="dirB76CABEA115EF02B8185B3B44FE0A498" Name="x86">
23-
<Component Id="cmpAE90F97C7AF9326D0BF41676BCA71D8C" Guid="{A3E6205C-21BF-4DDE-93EC-33AF4F0471C9}">
23+
<Component Id="cmpAE90F97C7AF9326D0BF41676BCA71D8C" Guid="{EDF09D1D-5F83-4131-95C2-A44B6699848D}">
2424
<File Id="fil46BE9EE69BFD3A3C72F07794487640AE" KeyPath="yes" Source="$(var.LetsEncryptPath)\x86\libeay32.dll" />
2525
</Component>
26-
<Component Id="cmp2393461C6BE3DFFB1CC7167B28BBFB00" Guid="{51C756AD-2835-4761-81E8-DBD2953433EF}">
26+
<Component Id="cmp2393461C6BE3DFFB1CC7167B28BBFB00" Guid="{83FD314F-44D1-4237-9B1D-25D3CE9B6B15}">
2727
<File Id="fil93F5D081D7A3040A5AF360DF37E42377" KeyPath="yes" Source="$(var.LetsEncryptPath)\x86\ssleay32.dll" />
2828
</Component>
2929
</Directory>

‎eFormAPI/Installation/MainInstaller/MaintenanceTypeModifiedDlg.wxs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Publish Property="DOMAINNAME" Value="{}" >1</Publish>
1414
<Publish Property="CUSTOMERNUMBER" Value="{}" >1</Publish>
1515
<Publish Property="GENERATESSL" Value="{}" >1</Publish>
16+
<Publish Property="EMAIL" Value="{}" >1</Publish>
1617
<Publish Property="CONFIGURATIONEXISTS" Value="{}" >1</Publish>
1718
</Control>
1819
<Control Id="Update" Type="PushButton" X="98" Y="139" Width="139" Height="33" Text="&amp;Update" >

‎eFormAPI/Installation/MainInstaller/Product.wxs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<Property Id="DOMAINNAME" Value="{}" Secure="yes" />
3939
<Property Id="CUSTOMERNUMBER" Value="{}" Secure="yes" />
4040
<Property Id="GENERATESSL" Value="{}" Secure="yes" />
41+
<Property Id="EMAIL" Value="{}" Secure="yes" />
4142
<Property Id="INSTALLFOLDER" Value="C:\inetpub\wwwroot" Secure="yes" />
4243
<Property Id="KEEPFOLDERS" Value="eform-api\output" Secure="yes"/>
4344
<Property Id="KEEPSETTINGS" Value="1" Secure="yes"/>
@@ -70,7 +71,7 @@
7071

7172
<Binary Id="BinaryCA" SourceFile="BuildedCustomActions\CustomActions.CA.dll" />
7273

73-
<CustomAction Id="SetInstalValues" Property="Install" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];CUSTOMERNUMBER=[CUSTOMERNUMBER];GENERATESSL=[GENERATESSL];INSTALLFOLDER=[INSTALLFOLDER];USEEXISTINGCONFIGURATION=[USEEXISTINGCONFIGURATION];CONFIGURATIONEXISTS=[CONFIGURATIONEXISTS];KEEPFOLDERS=[KEEPFOLDERS];KEEPFILES=[KEEPFILES]"/>
74+
<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]"/>
7475
<CustomAction Id="SetRemoveValues" Property="RemoveService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];KEEPFOLDERS=[KEEPFOLDERS];KEEPSETTINGS=[KEEPSETTINGS];KEEPFILES=[KEEPFILES]" />
7576
<CustomAction Id="SetUpdateServiceValues" Property="UpdateService" Value="INSTMODE=[INSTMODE];DOMAINNAME=[DOMAINNAME];INSTALLFOLDER=[INSTALLFOLDER]" />
7677

0 commit comments

Comments
 (0)