Remove the option of not installing shibd_default

[shibboleth/sp.git] / msi / WiX / ShibbolethSP-noarch.wxs

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 0768644..ca7ab67 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -204,9 +204,6 @@
     <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />\r
     <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />\r
 \r
-    <!-- Set INSTALL_SHIBD correctly -->\r
-    <CustomAction Id='ClearInstallShibd' Property='INSTALL_SHIBD_SERVICE' Value='FALSE' />\r
-\r
     <InstallUISequence>\r
       <!-- All we need to sequence here is setting up inherited INSTALLDIR -->\r
 \r
@@ -254,10 +251,10 @@
       <!-- set service path to 64 bit one if this is an install and if we were told to -->\r
 \r
       <Custom Action='SetServicePath64' Before='CostInitialize'>\r
-        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
       </Custom>\r
       <Custom Action='ServicePath64' After='InstallServices'>\r
-        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
       </Custom>\r
 \r
       <!-- Duplicate actions from the UI case -->\r
@@ -268,19 +265,10 @@
         (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64\r
       </Custom>\r
 \r
-      <!-- Clear out INSTALL_SHIBD_SERVICE (Set it to FALSE) if\r
-           - This is an update\r
-           - We didn't see an appropriate registryEntry\r
-           - TODO - we don't need this here I think\r
-        -->\r
-      <Custom Action='ClearInstallShibd' After='AppSearch'>\r
-        ALREADYINSTALLED AND (NOT OLD_SERVICEINSTALLED)\r
-      </Custom>\r
-\r
       <!-- Do not mess with SCM if this is an upgrade -->\r
 \r
-      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>\r
-      <StartServices>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE")</StartServices>\r
+      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>\r
+      <StartServices>(NOT Installed)</StartServices>\r
       <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>\r
 \r
     </InstallExecuteSequence>\r