[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: ShibbolethIdP-main.wxs procrun.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Sat Sep 17 11:45:21 2016
New Revision: 8400

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8400&view=rev
Log:
IDP-874 Command line property to supress setting firewall exceptions

https://issues.shibboleth.net/jira/browse/IDP-874

Specifying NO_FIREWALL_EXCPEPTION=xyz on the msiexec line will arrange
for the automatic creation of firewall exceptions to be supressed.

Modified:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=8400&r1=8399&r2=8400&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	(original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs	Sat Sep 17 11:45:21 2016
@@ -101,6 +101,9 @@
         <CustomAction Id="InheritQIInstallJetty" Property="INSTALL_JETTY" Value="TRUE" />
         <CustomAction Id="InheritQIConfigAd" Property="CONFIGURE_AD" Value="TRUE" />
 
+        <!-- Pass the NO_FIREWALL_EXCEPTION parameter down to the Jetty Merge Module -->
+        <CustomAction Id="PassdownNoFireWall" Property="NO_FIREWALL.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Value="[NO_FIREWALL_EXCEPTION]" />
+
         <!-- Other properties -->
         <CustomAction Id="SetDNSName" Property="DNSNAME" Value="[ComputerName]" />
 
@@ -160,6 +163,9 @@
             <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR</Custom>
 
             <Custom Action="InheritInstallJetty" After="AppSearch">OLD_JETTY_INSTALL AND NOT JETTY_INSTALL</Custom>
+
+            <!-- Pass across the instruction about the firewall-->
+            <Custom Action="PassdownNoFireWall" After="AppSearch">NO_FIREWALL_EXCEPTION</Custom>
 
             <!-- Setup JAVA_IDP_HOME before we use it -->
 

Modified: trunk/idp-installer/src/main/wix/procrun.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/procrun.wxs?rev=8400&r1=8399&r2=8400&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/procrun.wxs	(original)
+++ trunk/idp-installer/src/main/wix/procrun.wxs	Sat Sep 17 11:45:21 2016
@@ -51,27 +51,37 @@
 	    -->
             <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" />
-                <fw:FirewallException Id="Win32Shibd_idp" Program="[#file_procrun_32_service]" Name="Win32Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
                 <?if $(var.msitype) = "x86" ?>
                 <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth 3 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
                 <?endif ?>
+            </Component>
+            <Component Id="procrun_32_Firewall" Directory="PROCRUNROOT" Guid="{F93B8D9F-7BBA-4D79-995D-4AC20FF158E4}" KeyPath="yes">
+                 <Condition>Not NO_FIREWALL</Condition>
+                 <fw:FirewallException Id="Win32Shibd_idp" Program="[#file_procrun_32_service]" Name="Win32Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
             </Component>
 
             <Component Id="procrun_AMD64_service" Directory="dir64" Guid="{2673BCBE-3659-4AC6-B39C-DF1EEDF72C0E}">
                 <Condition>VersionNT64 And Not Intel64</Condition>
                 <File Id="file_procrun_AMD64_service" KeyPath="yes" Source="$(var.ProcrunSrc)\amd64\prunsrv.exe" Name="$(var.ServiceName).exe" />
-                <fw:FirewallException Id="Win64Shibd_idp" Program="[#file_procrun_AMD64_service]" Name="Win64Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
                 <?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" />
                 <?endif ?>
             </Component>
-            <Component Id="procrun_IA64_servce" Directory="diria64" Guid="{38261437-73B7-4E9A-BB6A-B1752157D379}">
+            <Component Id="procrun_AMD64_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" KeyPath="yes">
+                 <Condition>NOT NO_FIREWALL And VersionNT64 And Not Intel64</Condition>
+                 <fw:FirewallException Id="Win64Shibd_idp" Program="[#file_procrun_AMD64_service]" Name="Win64Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
+            </Component>
+

[... 15 lines stripped ...]