[java-identity-provider] 04/06: IDP-2045 Consider adding ALWAYS_START_SERVICE to the Windows Installer

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=7c84599d0a02d37aba934eb64dfb6fcd2125566e

commit 7c84599d0a02d37aba934eb64dfb6fcd2125566e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Dec 7 14:04:44 2022 +0000

    IDP-2045 Consider adding ALWAYS_START_SERVICE to the Windows Installer
    
    https://shibboleth.atlassian.net/browse/IDP-2045
    
    This defaults on but you can supress starting the service by saying
    ALWAYS_START_SERVICE=NO
---
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 5 ++++-
 idp-installer/src/main/wix/procrun.wxs            | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index fa61d7461..92ad88621 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -126,6 +126,8 @@
             </DirectorySearch>
         </Property>
 
+        <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
+        <CustomAction Id="PassdownStartService" Property="ALWAYS_START_SERVICE.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Value="[ALWAYS_START_SERVICE]" />
 
         <CustomAction Id="NoJavaBin" Error="Could not locate Java.exe.  Please check the value for JAVA_HOME." />
 
@@ -189,8 +191,9 @@
 
             <Custom Action="InheritInstallJetty" After="AppSearch">OLD_JETTY_INSTALL AND NOT JETTY_INSTALL</Custom>
 
-            <!-- Pass across the instruction about the firewall-->
+            <!-- Pass across the instructions to Jetty-->
             <Custom Action="PassdownNoFireWall" After="AppSearch">NO_FIREWALL_EXCEPTION</Custom>
+            <Custom Action="PassdownStartService" After="AppSearch"/>
 
             <!-- Setup JAVA_IDP_HOME before we use it -->
 
diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index e7f6d1659..9d070ce45 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -26,6 +26,8 @@
         <Binary Id="DoRandomSrc" SourceFile="scripts\shib_random.vbs" />
         <CustomAction Id="MakeRandom" BinaryKey="DoRandomSrc" VBScriptCall="" Execute="immediate" />
         <InstallExecuteSequence>
+            <!-- Do/Do Not not start service -->
+            <StartServices>(ALWAYS_START_SERVICE = "TRUE")</StartServices>
             <Custom Action="MakeRandom" Before="WriteRegistryValues">NOT Installed</Custom>
         </InstallExecuteSequence>
     </Fragment>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.