[shibboleth-sp2] 66/82: SSPCPP-754 Do not give the option to install 32 bit shibd on x64
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit ad6c6e5992882057ddc0f71e5d4231e1b0df841f
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Mon Sep 25 11:22:04 2017 +0100
SSPCPP-754 Do not give the option to install 32 bit shibd on x64
https://issues.shibboleth.net/jira/browse/SSPCPP-754
In 3.0 shibd is architecturally independant. This means we no
longer need allow people to choose which shibd to make a service.
The 32 bit shibd is still installed but each architecture installs
the correct service. This has all sorts of impacts on what gets
installed and where.
---
configs/SetService32.bat | 9 --
configs/SetService64.bat | 9 --
msi/WiX/ShibbolethSP-defs-x86.wxi | 1 -
msi/WiX/ShibbolethSP-exe-x64.wxs | 4 +-
msi/WiX/ShibbolethSP-exe-x86.wxs | 12 +-
msi/WiX/ShibbolethSP-install-dlg.wxs | 13 +-
msi/WiX/ShibbolethSP-main-x64.wxs | 32 ++---
msi/WiX/ShibbolethSP-main-x86.wxs | 15 ++-
msi/WiX/ShibbolethSP-noarch.wxs | 12 +-
msi/scripts/shib_edit_config_files.vbs | 209 -----------------------------
msi/scripts/shib_edit_config_files.vbs-wix | 9 +-
11 files changed, 37 insertions(+), 288 deletions(-)
diff --git a/configs/SetService32.bat b/configs/SetService32.bat
deleted file mode 100644
index b0831d6..0000000
--- a/configs/SetService32.bat
+++ /dev/null
@@ -1,9 +0,0 @@
- at echo off
-setlocal
-
-sc stop shibd_default
-sc config shibd_default binPath= "@-INSTALLDIR-@\sbin\shibd.exe -stdout \"@-INSTALLDIR-@\var\log\shibboleth\stdout.log\" -stderr \"@-INSTALLDIR-@\var\log\shibboleth\stderr.log\""
-ping 1.1.1.1 -n 1 -w 3000 > nul
-sc start shibd_default
-
-echo NOTE: You will need to manually adjust your IIS or Apache configuration to complete a switch to 32-bit use.
\ No newline at end of file
diff --git a/configs/SetService64.bat b/configs/SetService64.bat
deleted file mode 100644
index c2704b5..0000000
--- a/configs/SetService64.bat
+++ /dev/null
@@ -1,9 +0,0 @@
- at echo off
-setlocal
-
-sc stop shibd_default
-sc config shibd_default binPath= "@-INSTALLDIR-@\sbin64\shibd.exe -stdout \"@-INSTALLDIR-@\var\log\shibboleth\stdout.log\" -stderr \"@-INSTALLDIR-@\var\log\shibboleth\stderr.log\""
-ping 1.1.1.1 -n 1 -w 3000 > nul
-sc start shibd_default
-
-echo NOTE: You will need to manually adjust your IIS or Apache configuration to complete a switch to 64-bit use.
\ No newline at end of file
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index cd230dd..9cc9ab1 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -80,7 +80,6 @@
<ComponentRef Id="shibresponder.exe_debug" />
<?endif?>
- <ComponentRef Id="shibd.exe" />
<ComponentRef Id="shibd.exe_debug" />
<!-- ShibbolethSP-registry-x32 -->
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 875d643..274c667 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -115,9 +115,7 @@
</Directory><!-- lib -->
<!-- the service bin -->
<Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release'>
- <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>
- <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />
- </Component>
+ <!-- Service bins are declared in main -->
<Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug'>
<Component Id='shibd64.exe_debug' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibd64.exe_debug' Name='shibd.exe' />
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index 4d09437..ed22c34 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -125,17 +125,7 @@
</Directory><!-- lib -->
<!-- the service bin -->
<Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release'>
- <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
- <File KeyPath='yes' Checksum='yes' Name='shibd.exe' />
- <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
- <ServiceInstall Id='shibd' Name='shibd_Default'
- DisplayName='Shibboleth 2 Daemon (Default)'
- Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
- Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
- Type='ownProcess' Start='auto' ErrorControl='ignore' />
- <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
- Remove='uninstall' Start='install' Wait='no' />
- </Component>
+ <!-- Service bin is installed in main-x86 (with service) and main-64 (without) -->
<Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug'>
<Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
<File KeyPath='yes' Checksum='yes' Id='shibd.exe_debug' Name='shibd.exe' />
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
index 6c3bfd1..1150113 100644
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -25,7 +25,6 @@
<!-- This Dialog sets up:
- INSTALLDIR
- - INSTALL_32BIT (if a 64bit machine)
- INSTALL_IIS7_PLUGIN (if IIS about)
-->
@@ -56,19 +55,11 @@
</Control>
<!-- Service? -->
- <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235'
+ <Control Id='InstallShibd' Type='Text' X='25' Y='142' Height='17' Width='195'
Text='The Shibboleth Daemon will be installed as a service.' />
- <!-- 32 Bits? -->
- <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'
- Property='INSTALL_32BIT' CheckBoxValue='TRUE'
- Text='Run as 32-Bit'>
- <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>
- <Condition Action='hide'>IS64BITINSTALL <> "TRUE"</Condition>
- </Control>
-
<!-- IIS7 Plugin -->
- <Control Id='InstallIIS7' Type='CheckBox' X='25' Y='175' Height='17' Width='160'
+ <Control Id='InstallIIS7' Type='CheckBox' X='225' Y='140' Height='17' Width='120'
Property='INSTALL_IIS7_PLUGIN' CheckBoxValue='TRUE'
Text='Configure IIS7 modules'>
<Condition Action='show'>IISMAJORVERSION AND (IISMAJORVERSION <> "#6")</Condition>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 905adcd..f63d9c9 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -39,9 +39,8 @@
<!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
<Property Id='IS64BITINSTALL' Value='TRUE'/>
- <Property Id='INSTALL_32BIT' Secure='yes' />
- <UIRef Id='ShibbolethInstallDir'/>
+ <UIRef Id='ShibbolethInstallDir'/>
<!-- Files -->
<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -95,15 +94,6 @@
</Component>
</Directory><!--TARGETDIR-->
- <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
- <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>
- <File KeyPath='yes' Name='SetService64.bat' />
- </Component>
- <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>
- <File KeyPath='yes' Name='SetService32.bat' />
- </Component>
- </DirectoryRef><!-- etc_shibboleth -->
-
<Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>
<MergeRef Id='CurlMergeModule_x86'/>
<?if $(var.FCGI) != "" ?>
@@ -172,7 +162,6 @@
<ComponentRef Id='shibresponder64.exe_debug'/>
<?endif?>
- <ComponentRef Id='shibd64.exe'/>
<ComponentRef Id='shibd64.exe_debug'/>
<!-- ShibbolethSP-registry-x64 -->
@@ -184,9 +173,6 @@
<ComponentRef Id='SetPath'/>
<ComponentRef Id='SetPath64'/>
- <ComponentRef Id='SetService64' />
- <ComponentRef Id='SetService32' />
-
<?include ShibbolethSP-defs-x86.wxi ?>
<!--
@@ -219,6 +205,22 @@
</RegistryKey>
</Component>
+ <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}' Directory='sbin'>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe' />
+ </Component>
+
+ <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes' Directory='sbin64'>
+ <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.exe' />
+ <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
+ <ServiceInstall Id='shibd' Name='shibd_Default'
+ DisplayName='Shibboleth 2 Daemon (Default)'
+ Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
+ Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
+ Type='ownProcess' Start='auto' ErrorControl='ignore' />
+ <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
+ Remove='uninstall' Start='install' Wait='no' />
+ </Component>
+
</Feature>
<!-- Also put in the configuration for IIS7 - There is a difference between 32 and 64 bit dlls and
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 70da4d2..3ce6671 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -30,7 +30,7 @@
<Condition Message='Shibboleth requires Windows Vista or later.'>NOT VersionNT OR (VersionNT >= 600)</Condition>
<Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
- <Condition Message='You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+ <Condition Message='You must uninstall very old versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none")</Condition>
<Condition Message='For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults'>NOT VersionNT64</Condition>
@@ -40,7 +40,6 @@
<!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
<Property Id='IS64BITINSTALL' Value='FALSE'/>
- <Property Id='INSTALL_32BIT' Secure='yes' Value='TRUE' />
<UIRef Id='ShibbolethInstallDir'/>
@@ -130,7 +129,17 @@
</RegistryKey>
</Component>
-
+ <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}' Directory='sbin'>
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe' />
+ <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
+ <ServiceInstall Id='shibd' Name='shibd_Default'
+ DisplayName='Shibboleth 2 Daemon (Default)'
+ Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
+ Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
+ Type='ownProcess' Start='auto' ErrorControl='ignore' />
+ <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'
+ Remove='uninstall' Start='install' Wait='no' />
+ </Component>
</Feature>
<!-- Also put in the configuration for IIS7 - There is a difference between 32 and 64 bit dlls and
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 78e5bc7..c48ca3c 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -166,14 +166,11 @@
<CustomAction Id='EditConfigFiles'
BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
- <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[IS64BITINSTALL];@;[INSTALL_32BIT]' />
+ <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[IS64BITINSTALL]' />
<CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
<CustomAction Id='SetKeyGen' Property='KeyGen' Value='"[INSTALLDIR]etc\shibboleth\keygen.bat"' />
- <CustomAction Id='ServicePath64' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
- <CustomAction Id='SetServicePath64' Property='ServicePath64' Value='"[INSTALLDIR]etc\shibboleth\SetService64.bat"' />
-
<!-- Inherit the installation dir if one was set -->
<CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
<CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
@@ -200,13 +197,6 @@
<!-- IIS handling is no longer architecture independant and happens in ShibbolethSP-main-x?? -->
- <Custom Action='SetServicePath64' Before='CostInitialize'>
- (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
- </Custom>
- <Custom Action='ServicePath64' After='InstallServices'>
- (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
- </Custom>
-
<!-- Duplicate actions from the UI case -->
<Custom Action='InheritInstallDir' After='AppSearch'>
OLD_INSTALLDIR
diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
deleted file mode 100644
index 5b70b0a..0000000
--- a/msi/scripts/shib_edit_config_files.vbs
+++ /dev/null
@@ -1,209 +0,0 @@
-Function ReadFile( filePath )
- Dim theFile
-
- 'OpenTextFile args: <path>, 1 = ForReading
- 'If you read an empty file, VBScript throws an error for some reason
- if (FileSystemObj.FileExists(filePath)) then
- Set theFile = FileSystemObj.GetFile(filePath)
- if (theFile.size > 0) then
- Set theFile = FileSystemObj.OpenTextFile(filePath, 1)
- ReadFile = theFile.ReadAll
- else
- ReadFile = ""
- end if
- else
- ReadFile = ""
- end if
-End Function
-
-Sub WriteFile( filePath, contents )
- Dim theFile
-
- 'OpenTextFile args: <path>, 2 = ForWriting, True = create if not exist
- Set theFile = FileSystemObj.OpenTextFile(filePath, 2, True)
- theFile.Write contents
-End Sub
-
-Sub ReplaceInFile( filePath, lookForStr, replaceWithStr )
- Dim buffer
-
- buffer = ReadFile(filePath)
- if (buffer <> "") then
- buffer = Replace(buffer, lookForStr, replaceWithStr)
- WriteFile filePath, buffer
- end if
-End Sub
-
-
-Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir, WshShell
-Dim customData, msiProperties, InstallDir, ShibdPort
-
-on error resume next
-Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
-if (Err = 0) then
-
- 'Get the INSTALLDIR and SHIBD_PORT values via CustomActionData
- customData = Session.Property("CustomActionData")
- msiProperties = split(customData,";@;")
- InstallDir = msiProperties(0)
- ShibdPort = msiProperties(1)
-
- 'Remove all trailing backslashes to normalize
- do while (mid(InstallDir,Len(InstallDir),1) = "\")
- InstallDir = mid(InstallDir,1,Len(InstallDir)-1)
- loop
- ConvertedDir = Replace(InstallDir, "\", "/")
- ConfigDir = InstallDir & "\etc\shibboleth\"
- DistDir = ConfigDir & "dist\"
-
- 'Set ConvertedDir as the SHIBSP_PREFIX system variable.
- Set WshShell = CreateObject("WScript.Shell")
- WshShell.RegWrite "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\SHIBSP_PREFIX", ConvertedDir, "REG_SZ"
-
- 'Perform actual Substitutions
- 'Afterwards, if the config file doesn't already exist, copy up to etc/shibboleth
- 'Also strip *.in for files in dist
-
- ConfigFile = DistDir & "shibd.logger.in"
- ReplaceInFile ConfigFile, "@-PKGLOGDIR-@", ConvertedDir & "/var/log/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibd.logger")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibd.logger", false
- End If
- If (FileSystemObj.FileExists(DistDir & "shibd.logger")) then
- FileSystemObj.DeleteFile DistDir & "shibd.logger", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "shibd.logger"
-
- ConfigFile = DistDir & "native.logger.in"
- ReplaceInFile ConfigFile, "@-SHIRELOGDIR-@", ConvertedDir & "/var/log/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "native.logger")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "native.logger", false
- End If
- If (FileSystemObj.FileExists(DistDir & "native.logger")) then
- FileSystemObj.DeleteFile DistDir & "native.logger", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "native.logger"
-
- ConfigFile = DistDir & "apache.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache.config")) then
- FileSystemObj.DeleteFile DistDir & "apache.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache.config"
-
- ConfigFile = DistDir & "apache2.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache2.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache2.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache2.config")) then
- FileSystemObj.DeleteFile DistDir & "apache2.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache2.config"
-
- ConfigFile = DistDir & "apache22.config.in"
- ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
- ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
- If (NOT FileSystemObj.FileExists(ConfigDir & "apache22.config")) then
- FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache22.config", false
- End If
- If (FileSystemObj.FileExists(DistDir & "apache22.config")) then
- FileSystemObj.DeleteFile DistDir & "apache22.config", true
- End If
- FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"
-
- 'Now just copy the other non-edited files over as well (if possible)
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
- FileSystemObj.CopyFile DistDir & "shibboleth2.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
- FileSystemObj.CopyFile DistDir & "accessError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "metadataError.html")) then
- FileSystemObj.CopyFile DistDir & "metadataError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "sessionError.html")) then
- FileSystemObj.CopyFile DistDir & "sessionError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "sslError.html")) then
- FileSystemObj.CopyFile DistDir & "sslError.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "bindingTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "bindingTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "discoveryTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "discoveryTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "postTemplate.html")) then
- FileSystemObj.CopyFile DistDir & "postTemplate.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "localLogout.html")) then
- FileSystemObj.CopyFile DistDir & "localLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "globalLogout.html")) then
- FileSystemObj.CopyFile DistDir & "globalLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "partialLogout.html")) then
- FileSystemObj.CopyFile DistDir & "partialLogout.html", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "console.logger")) then
- FileSystemObj.CopyFile DistDir & "console.logger", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth.logger")) then
- FileSystemObj.CopyFile DistDir & "shibboleth.logger", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-map.xml")) then
- FileSystemObj.CopyFile DistDir & "attribute-map.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-policy.xml")) then
- FileSystemObj.CopyFile DistDir & "attribute-policy.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "security-policy.xml")) then
- FileSystemObj.CopyFile DistDir & "security-policy.xml", ConfigDir, false
- End If
-
- If (NOT FileSystemObj.FileExists(ConfigDir & "protocols.xml")) then
- FileSystemObj.CopyFile DistDir & "protocols.xml", ConfigDir, false
- End If
-
- 'Finally, fix up schema catalogs.
-
- XMLDir = InstallDir & "\share\xml\xmltooling\"
- ConfigFile = XMLDir & "catalog.xml"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
-
- XMLDir = InstallDir & "\share\xml\opensaml\"
- ConfigFile = XMLDir & "saml20-catalog.xml"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
- ConfigFile = XMLDir & "saml11-catalog.xml"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
- ConfigFile = XMLDir & "saml10-catalog.xml"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
-
- XMLDir = InstallDir & "\share\xml\shibboleth\"
- ConfigFile = XMLDir & "catalog.xml"
- ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
-
-'Last End If
-End If
\ No newline at end of file
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index 0aacd1c..d4feb11 100644
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -36,7 +36,7 @@ End Sub
Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir, WshShell
-Dim customData, msiProperties, InstallDir, LibDir, Is64Bit, Install32, LogFile
+Dim customData, msiProperties, InstallDir, LibDir, Is64Bit, LogFile
on error resume next
Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
@@ -47,19 +47,16 @@ if (Err = 0) then
msiProperties = split(customData,";@;")
InstallDir = msiProperties(0)
Is64Bit = msiProperties(1)
- Install32 = msiProperties(2)
LibDir = "lib"
If (Is64Bit = "TRUE") then
- If (Install32 <> "TRUE") then
- LibDir = "lib64"
- End If
+ LibDir = "lib64"
End If
Set LogFile = FileSystemObj.OpenTextFile(InstallDir & "\var\log\shibboleth\Installer.log", 8, true)
If (LogFile) then
- LogFile.WriteLine "Edit Config Files to " & InstallDir & ", 64Bit = " & Is64Bit & ", 32Bit = " & Install32
+ LogFile.WriteLine "Edit Config Files to " & InstallDir & ", 64Bit = " & Is64Bit
End If
'Remove all trailing backslashes to normalize
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list