projects / shibboleth / sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove the option of not installing shibd_default
[shibboleth/sp.git] / msi / WiX / ShibbolethSP-install-dlg.wxs
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
index 238a24a..71c184e 100644 (file)
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -25,7 +25,6 @@
 \r
       <!-- This Dialog sets up:\r
            - INSTALLDIR\r
-           - INSTALL_SHIBD_SERVICE\r
            - INSTALL_32BIT (if a 64bit machine)\r
            - INSTALL_ISAPI_FILTER (if IIS about)\r
            - SHIB_FILE_EXTENSION (if IIS about)\r
@@ -47,7 +46,7 @@
         <Control Id='DescriptionLine2' Type='Text' X='25' Y='70' Height='12' Width='320' \r
                  Text='To install into a different folder, click the Browse button, and select another folder.'/>\r
 \r
-        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='12' Width='320' \r
+        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='24' Width='320' \r
                  Text='You can choose not to install [ProductName] by clicking Cancel to exit the installer.' />\r
 \r
         <!-- Where? -->\r
@@ -58,12 +57,11 @@
         </Control>\r
 \r
         <!-- Service? -->\r
-        <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' \r
-                 Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' \r
-                 Text='Install shibd as Service' />\r
+        <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' \r
+                 Text='The Shibboleth daemon will be installed as service shibd_default.' />\r
 \r
         <!-- 32 Bits? -->\r
-        <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'\r
+        <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'\r
                  Property='INSTALL_32BIT' CheckBoxValue='TRUE' \r
                  Text='Run as 32-Bit'>\r
           <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>\r
Shibboleth SP