[java-identity-provider] 02/02: IDP-1741 Blunder on if the service doesn't start

[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=82cd523bbc19fac23fc3cec1a5de1c893c7108c0

commit 82cd523bbc19fac23fc3cec1a5de1c893c7108c0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 26 10:47:32 2021 +0000

    IDP-1741 Blunder on if the service doesn't start
    
    https://issues.shibboleth.net/jira/browse/IDP-1741
---
 idp-installer/src/main/wix/procrun.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index 3ef116100..a2f502436 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -50,7 +50,7 @@
             <Component Id="procrun_32_service" Directory="PROCRUNROOT" Guid="{544A5D33-CF99-4384-A74D-79FB29DE904D}">
                 <File Id="file_procrun_32_service" KeyPath="yes" Source="$(var.ProcrunSrc)\prunsrv.exe" Name="$(var.ServiceName).exe" />
                 <?if $(var.msitype) = "x86" ?>
-                <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth V4 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
+                <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="ignore" />
                 <?endif ?>
             </Component>
             <Component Id="procrun_32_Firewall" Directory="PROCRUNROOT" Guid="{F93B8D9F-7BBA-4D79-995D-4AC20FF158E4}" KeyPath="yes">
@@ -62,7 +62,7 @@
                 <Condition>VersionNT64 And Not Intel64</Condition>
                 <File Id="file_procrun_AMD64_service" KeyPath="yes" Source="$(var.ProcrunSrc)\amd64\prunsrv.exe" Name="$(var.ServiceName).exe" />
                 <?if $(var.msitype) != "x86" ?>
-                <ServiceInstall Id="ServiceX64" Name="$(var.ServiceName)" DisplayName="Shibboleth 3 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
+                <ServiceInstall Id="ServiceX64" Name="$(var.ServiceName)" DisplayName="Shibboleth IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="ignore" />
                 <?endif ?>
             </Component>
             <Component Id="procrun_AMD64_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" KeyPath="yes">

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