From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Sun, 10 Jun 2012 21:35:51 +0000 (+0000)
Subject: Add Apache 2.4 config edit
X-Git-Tag: 2.5.0~52
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=dab702f9ea8ab716cdce3593acf4b9192514e058

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
--- 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
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"
 
+  ConfigFile = DistDir & "apache24.config.in"
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
+  If (NOT FileSystemObj.FileExists(ConfigDir & "apache24.config")) then
+    FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache24.config", false
+  End If
+  If (FileSystemObj.FileExists(DistDir & "apache24.config")) then
+    FileSystemObj.DeleteFile DistDir & "apache24.config", true
+  End If
+  FileSystemObj.MoveFile ConfigFile, DistDir & "apache24.config"
+
   'Now just copy the other non-edited files over as well (if possible)
 
   If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then