Add Apache 2.4 config edit

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3706 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index e32b307..1165ee3 100644 (file)
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -123,6 +123,17 @@ if (Err = 0) then
   End If\r
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"\r
 \r
+  ConfigFile = DistDir & "apache24.config.in"\r
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"\r
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"\r
+  If (NOT FileSystemObj.FileExists(ConfigDir & "apache24.config")) then\r
+    FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache24.config", false\r
+  End If\r
+  If (FileSystemObj.FileExists(DistDir & "apache24.config")) then\r
+    FileSystemObj.DeleteFile DistDir & "apache24.config", true\r
+  End If\r
+  FileSystemObj.MoveFile ConfigFile, DistDir & "apache24.config"\r
+\r
   'Now just copy the other non-edited files over as well (if possible)\r
 \r
   If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then\r