|
81 | 81 | </Property> |
82 | 82 | <PropertyId="MSIUSEREALADMINDETECTION"Value="1" /> |
83 | 83 | <ConditionMessage="This setup requires IIS 6.0, 7.0 or 8.0 is installed."><![CDATA[(IIS="#7") OR (IIS="#6") OR (IIS="#8")]]></Condition> |
84 | | -<!-- Version 2.7.6 had an uninstall issue that leaves some files behind. Asking the user to manually hash this out.--> |
| 84 | +<!-- Version 2.7.5 had an uninstall issue that leaves some files behind. Asking the user to manually hash this out.--> |
85 | 85 | <ConditionMessage="A older version of ModSecurityIIS was found in your computer. Please complete uninstall by removing the following file: [FILEEXISTS]. You may have to remove ModSecurity module from IIS, use the IIS Manager to do so."><![CDATA[(NOT FILEEXISTS) OR (Installed)]]></Condition> |
86 | 86 | <ConditionMessage="64-bit operating system was detected, please use the 64-bit installer."> |
87 | 87 | <?if $(var.Win64) ="yes" ?> |
88 | | -VersionNT64 |
89 | | -<?else ?> |
90 | | -NOT VersionNT64 |
91 | | -<?endif ?></Condition> |
| 88 | + VersionNT64 |
| 89 | + <?else ?> |
| 90 | + NOT VersionNT64 |
| 91 | + <?endif ?></Condition> |
92 | 92 | <MediaId="1"Cabinet="simple.cab"EmbedCab="yes" /> |
93 | 93 | <DirectoryId="TARGETDIR"Name="SourceDir"> |
94 | 94 | <?if $(var.Win64) ="yes" ?> |
|
296 | 296 | <ShortcutId="UninstallProduct"Name="Uninstall"Description="Uninstalls the ModSecurity IIS"Target="[System64Folder]msiexec.exe"Arguments="/x [ProductCode]" /> |
297 | 297 | <ShortcutId="EULA"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]EULA.rtf"WorkingDirectory="INSTALLFOLDER" /> |
298 | 298 | <ShortcutId="Readme"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]README.TXT"WorkingDirectory="INSTALLFOLDER" /> |
| 299 | + <?if $(var.Win64) ="yes" ?> |
| 300 | + <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv64]libapr-1.dll""[inetsrv64]libapriconv-1.dll""[inetsrv64]libaprutil-1.dll""[inetsrv64]libcurl.dll""[inetsrv64]libxml2.dll""[inetsrv64]lua5.1.dll""[inetsrv64]mlogc.exe""[inetsrv64]ModSecurityIIS.dll""[inetsrv64]pcre.dll""[inetsrv64]zlib1.dll""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""WorkingDirectory="INSTALLFOLDER" /> |
| 301 | + <?else ?> |
| 302 | + <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""WorkingDirectory="INSTALLFOLDER" /> |
| 303 | + <?endif ?> |
299 | 304 | </Component> |
300 | 305 | </Directory> |
301 | 306 | </Directory> |
|
307 | 312 | <FileId="modsecurity.conf"Name="modsecurity.conf"Source="wix\modsecurity.conf" /> |
308 | 313 | <FileId="modsecurity_iis.conf"Name="modsecurity_iis.conf"Source="wix\modsecurity_iis.conf" /> |
309 | 314 | <FileId="modsecurity_crs_10_setup.conf"Name="modsecurity_crs_10_setup.conf"Source="wix\modsecurity_crs_10_setup.conf" /> |
| 315 | + <FileId="LIST_DEPENDENCIES.BAT"Name="list_dependencies.bat"Source="wix\list_dependencies.bat" /> |
310 | 316 | </Component> |
311 | 317 | </DirectoryRef> |
312 | 318 | <?if $(var.Win64) ="yes" ?> |
|
402 | 408 | <UIId="WixUI_FeatureTreeCustom"> |
403 | 409 | <DialogId="CustomizeDlgModSec"Width="370"Height="270"Title="!(loc.CustomizeDlg_Title)"TrackDiskSpace="yes"> |
404 | 410 | <ControlId="Tree"Type="SelectionTree"X="25"Y="85"Width="175"Height="115"Property="_BrowseProperty"Sunken="yes"TabSkip="no"Text="!(loc.CustomizeDlgTree)"> |
| 411 | + <?if $(var.Win64) ="yes" ?> |
405 | 412 | <PublishProperty="DisableButton"Value="1">(NOT&ModSec64=3) AND (NOT&ModSec32=3)</Publish> |
406 | 413 | <PublishProperty="DisableButton"Value="0">&ModSec64=3 OR&ModSec32=3</Publish> |
| 414 | + <?else ?> |
| 415 | + <PublishProperty="DisableButton"Value="1">(NOT&ModSec32=3)</Publish> |
| 416 | + <PublishProperty="DisableButton"Value="0">&ModSec32=3</Publish> |
| 417 | + <?endif ?> |
407 | 418 | </Control> |
408 | 419 | <ControlId="Browse"Type="PushButton"X="294"Y="210"Width="66"Height="17"Text="!(loc.CustomizeDlgBrowse)"> |
409 | 420 | <PublishEvent="SelectionBrowse"Value="BrowseDlg">1</Publish> |
|
450 | 461 | <ConditionAction="hide">Installed</Condition> |
451 | 462 | </Control> |
452 | 463 | </Dialog> |
453 | | - <PropertyId="CONFIGURE_IIS"Secure="yes"Value="1"> |
454 | | - <RegistrySearchId="ConfigureIISRegistrySearch"Type="raw"Root="HKLM"Key="SOFTWARE\ModSecurity\ModSecurity"Name="ConfigureIIS" /> |
| 464 | + <PropertyId="CONFIGURE_MODSECURITY_IIS"> |
| 465 | + <RegistrySearchId="ConfigureIISRegistrySearch"Type="raw"Root="HKLM"Key="SOFTWARE\ModSecurity\ModSecurityConfigureIIS"Name="ModSecurityConfigureIIS" /> |
455 | 466 | </Property> |
456 | 467 | <DialogId="RegisterDlg"Width="370"Height="270"Title="!(loc.VerifyReadyDlg_Title)"TrackDiskSpace="yes"> |
457 | 468 | <ControlId="Cancel"Type="PushButton"X="304"Y="243"Width="56"Height="17"Cancel="yes"Text="!(loc.WixUICancel)"> |
|
469 | 480 | <ControlId="Title"Type="Text"X="15"Y="6"Width="210"Height="15"Transparent="yes"NoPrefix="yes"Text="{\WixUI_Font_Title}IIS Setup" /> |
470 | 481 | <ControlId="Description"Type="Text"X="25"Y="23"Width="280"Height="15"Transparent="yes"NoPrefix="yes"Text="Choose to configure ModSecurity on IIS or not." /> |
471 | 482 | <ControlId="Text"Type="Text"X="25"Y="55"Width="320"Height="50"Text="ModSecurityIIS needs to be configured under IIS as a module. It is recommended to perform this configuration during the installation. However, if you are facing problems in the installation, the recomendation is to disable this step. This will facilitate the debugging process since the files will be installed in place. Note that some scripts will be installed along with ModSecurity common files that can be later used to help this configuration/debugging process." /> |
472 | | - <ControlType="CheckBox"Id="ConfigureIIS"Width="200"Height="14"X="25"Y="124"CheckBoxValue="1"Property="CONFIGURE_IIS"Text="Perform ModSecurityIIS configuration." /> |
| 483 | + <ControlType="CheckBox"Id="ConfigureIIS"Width="200"Height="14"X="25"Y="124"CheckBoxValue="1"Property="CONFIGURE_MODSECURITY_IIS"Text="Perform ModSecurityIIS configuration." /> |
473 | 484 | <ControlType="Text"Id="troubleshooting"Width="314"Height="37"X="26"Y="161"Text="For further information about problems during the installation, have a look at ModSecurityIIS Troubleshooting guide. Available at: https://github.com/SpiderLabs/ModSecurity/wiki/IIS-Troubleshooting" /> |
474 | 485 | </Dialog> |
475 | 486 | <BinaryId="bannrbmp"SourceFile="wix\banner.jpg" /> |
|
502 | 513 | <PublishDialog="RegisterDlg"Control="Back"Event="NewDialog"Value="CustomizeDlgModSec"Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> |
503 | 514 | <PublishDialog="RegisterDlg"Control="Next"Event="NewDialog"Value="VerifyReadyDlg"Order="2">NOT Installed OR WixUI_InstallMode = "Change"</Publish> |
504 | 515 | <PublishDialog="RegisterDlg"Control="Next"Event="NewDialog"Value="WelcomeDlg"Order="3">Installed AND PATCH</Publish> |
505 | | - <PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="CustomizeDlgModSec"Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> |
| 516 | + <PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="RegisterDlg"Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> |
506 | 517 | <PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="MaintenanceTypeDlg"Order="2">Installed AND NOT PATCH</Publish> |
507 | 518 | <PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="WelcomeDlg"Order="3">Installed AND PATCH</Publish> |
508 | 519 | <PublishDialog="MaintenanceWelcomeDlg"Control="Next"Event="NewDialog"Value="MaintenanceTypeDlg">1</Publish> |
|
516 | 527 | <WixVariableId="WixUIBannerBmp"Value="wix\banner.jpg" /> |
517 | 528 | <WixVariableId="WixUIDialogBmp"Value="wix\dialog.jpg" /> |
518 | 529 | <InstallUISequence> |
519 | | - <CustomAction="SetCONFIGURE_IIS"Before="AppSearch">NOT Installed AND NOT OLDERVERSIONDETECTED</Custom> |
| 530 | + <CustomAction="SetCONFIGURE_MODSECURITY_IIS"Before="AppSearch">NOT Installed AND NOT OLDERVERSIONDETECTED</Custom> |
520 | 531 | </InstallUISequence> |
521 | 532 | <InstallExecuteSequence> |
522 | | - <CustomAction="SetCONFIGURE_IIS"Before="AppSearch">NOT Installed AND NOT OLDERVERSIONDETECTED</Custom> |
| 533 | + <CustomAction="SetCONFIGURE_MODSECURITY_IIS"Before="AppSearch">NOT Installed AND NOT OLDERVERSIONDETECTED</Custom> |
523 | 534 | </InstallExecuteSequence> |
524 | | - <CustomActionId="SetCONFIGURE_IIS"Property="CONFIGURE_IIS"Value="1"Execute="firstSequence" /> |
| 535 | + <CustomActionId="SetCONFIGURE_MODSECURITY_IIS"Property="CONFIGURE_MODSECURITY_IIS"Value="1"Execute="firstSequence" /> |
525 | 536 | <InstallExecuteSequence> |
526 | 537 | <?if $(var.Win64) ="yes" ?> |
527 | | - <CustomAction="InstallModule64"Before="InstallFinalize"><![CDATA[NOT Installed ANDCONFIGURE_IIS]]></Custom> |
528 | | - <CustomAction="InstallModule32"After="InstallModule64"><![CDATA[NOT Installed ANDCONFIGURE_IIS]]></Custom> |
529 | | - <CustomAction="InstallConf"After="InstallModule32"><![CDATA[NOT Installed ANDCONFIGURE_IIS]]></Custom> |
530 | | - <CustomAction="UninstallConf"Before="RemoveFiles"><![CDATA[Installed ANDCONFIGURE_IIS]]></Custom> |
531 | | - <CustomAction="UninstallModule32"After="UninstallConf"><![CDATA[Installed ANDCONFIGURE_IIS]]></Custom> |
532 | | - <CustomAction="UninstallModule64"After="UninstallModule32"><![CDATA[Installed ANDCONFIGURE_IIS]]></Custom> |
| 538 | + <CustomAction="InstallModule64"Before="InstallFinalize"><![CDATA[NOT Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 539 | + <CustomAction="InstallModule32"After="InstallModule64"><![CDATA[NOT Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 540 | + <CustomAction="InstallConf"After="InstallModule32"><![CDATA[NOT Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 541 | + <CustomAction="UninstallConf"Before="RemoveFiles"><![CDATA[Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 542 | + <CustomAction="UninstallModule32"After="UninstallConf"><![CDATA[Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 543 | + <CustomAction="UninstallModule64"After="UninstallModule32"><![CDATA[Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
533 | 544 | <?else ?> |
534 | | - <CustomAction="InstallModule32"Before="InstallFinalize"><![CDATA[NOT Installed ANDCONFIGURE_IIS]]></Custom> |
535 | | - <CustomAction="InstallConf"After="InstallModule32"><![CDATA[NOT Installed ANDCONFIGURE_IIS]]></Custom> |
536 | | - <CustomAction="UninstallConf"Before="RemoveFiles"><![CDATA[Installed ANDCONFIGURE_IIS]]></Custom> |
537 | | - <CustomAction="UninstallModule32"After="UninstallConf"><![CDATA[Installed ANDCONFIGURE_IIS]]></Custom> |
| 545 | + <CustomAction="InstallModule32"Before="InstallFinalize"><![CDATA[NOT Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 546 | + <CustomAction="InstallConf"After="InstallModule32"><![CDATA[NOT Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 547 | + <CustomAction="UninstallConf"Before="RemoveFiles"><![CDATA[Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
| 548 | + <CustomAction="UninstallModule32"After="UninstallConf"><![CDATA[Installed ANDCONFIGURE_MODSECURITY_IIS]]></Custom> |
538 | 549 | <?endif ?> |
539 | 550 | </InstallExecuteSequence> |
540 | 551 | <?if $(var.Win64) ="yes" ?> |
541 | | - <CustomActionId="InstallModule32"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" install module /name:"ModSecurity IIS (32bits)" /image:"%SystemRoot%\System32\inetsrv\ModSecurityIIS.dll"" /> |
542 | | - <CustomActionId="InstallModule64"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" install module /name:"ModSecurity IIS (64bits)" /image:"%SystemRoot%\SysWOW64\inetsrv\ModSecurityIIS.dll"" /> |
| 552 | + <?if $(var.Win64) ="yes" ?> |
| 553 | + <CustomActionId="InstallModule32"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" install module /name:"ModSecurity IIS (64bits)" /image:"%SystemRoot%\System32\inetsrv\ModSecurityIIS.dll" /preCondition:"bitness64"" /> |
| 554 | + <?else ?> |
| 555 | + <CustomActionId="InstallModule32"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[SystemFolder]inetsrv\appcmd.exe" install module /name:"ModSecurity IIS (32bits)" /image:"%SystemRoot%\System32\inetsrv\ModSecurityIIS.dll"" /> |
| 556 | + <?endif ?> |
| 557 | + <CustomActionId="InstallModule64"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" install module /name:"ModSecurity IIS (32bits)" /image:"%SystemRoot%\SysWOW64\inetsrv\ModSecurityIIS.dll" /preCondition:"bitness32"" /> |
| 558 | + <?if $(var.Win64) ="yes" ?> |
543 | 559 | <CustomActionId="UninstallModule32"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" uninstall module /module.name:"ModSecurity IIS (32bits)"" /> |
544 | 560 | <CustomActionId="UninstallModule64"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" uninstall module /module.name:"ModSecurity IIS (64bits)"" /> |
| 561 | + <?else ?> |
| 562 | + <CustomActionId="UninstallModule32"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[SystemFolder]inetsrv\appcmd.exe" uninstall module /module.name:"ModSecurity IIS (32bits)"" /> |
| 563 | + <CustomActionId="UninstallModule64"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" uninstall module /module.name:"ModSecurity IIS (64bits)"" /> |
| 564 | + <?endif ?> |
545 | 565 | <CustomActionId="InstallConf"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" set config /section:"system.webServer/ModSecurity" /"enabled:true" /"configFile:[INSTALLFOLDER]modsecurity_iis.conf"" /> |
546 | 566 | <CustomActionId="UninstallConf"Execute="deferred"Impersonate="no"Return="check"Directory="INSTALLFOLDER"ExeCommand=""[System64Folder]inetsrv\appcmd.exe" clear config -section:"system.webServer/ModSecurity"" /> |
547 | 567 | <?else ?> |
|