https://issues.shibboleth.net/jira/browse/SSPCPP-463

[shibboleth/cpp-sp.git] / msi / scripts / shib_edit_config_files.vbs

diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index 889c5d3..5b70b0a 100644 (file)
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -117,15 +117,12 @@ if (Err = 0) then
   End If
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache22.config"
 
-  ConfigFile = DistDir & "shibboleth2.xml"
-  ReplaceInFile ConfigFile, "   <UnixListener address=""shibd.sock""/>", "<!-- <UnixListener address=""shibd.sock""/> -->"
-  ReplaceInFile ConfigFile, "<!-- <TCPListener address=""127.0.0.1"" port=""12345"" acl=""127.0.0.1""/> -->", "<TCPListener address=""127.0.0.1"" port=""" & ShibdPort & """ acl=""127.0.0.1""/>"
+  'Now just copy the other non-edited files over as well (if possible)
+
   If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth2.xml", false
+    FileSystemObj.CopyFile DistDir & "shibboleth2.xml", ConfigDir, false
   End If
 
-  'Now just copy the other non-edited files over as well (if possible)
-
   If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
     FileSystemObj.CopyFile DistDir & "accessError.html", ConfigDir, false
   End If
@@ -162,6 +159,10 @@ if (Err = 0) 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
@@ -170,10 +171,6 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "shibboleth.logger", ConfigDir, false
   End If
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "example-metadata.xml")) then
-    FileSystemObj.CopyFile DistDir & "example-metadata.xml", ConfigDir, false
-  End If
-
   If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-map.xml")) then
     FileSystemObj.CopyFile DistDir & "attribute-map.xml", ConfigDir, false
   End If
@@ -182,7 +179,15 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "attribute-policy.xml", ConfigDir, false
   End If
 
-  ' Finally, fix up schema catalogs.
+  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"