From dd6a722af46c213b93f0c22a96f66bd0af886b22 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sun, 10 Jun 2012 21:35:51 +0000 Subject: [PATCH] Add Apache 2.4 config edit --- msi/scripts/shib_edit_config_files.vbs-wix | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 -- 2.1.4