Switch plugin ctors to shortcut methods, and default the Listener in config.

[shibboleth/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 d9d3816..87ffc2d 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