X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2Fscripts%2Fshib_edit_config_files.vbs;h=3ce7ad11bb18f538223cd3372625c098c077bfdc;hb=ea4aec55a31d84e6c0cf86759032681d465da66e;hp=350681c79623cf4c06c5fec55b523de7e55ed0c6;hpb=7966e19657bfaf34aa30e1b75ff62fe257cd6ef6;p=shibboleth%2Fsp.git

diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index 350681c..3ce7ad1 100644
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -35,7 +35,7 @@ Sub ReplaceInFile( filePath, lookForStr, replaceWithStr )
 End Sub
 
 
-Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir
+Dim FileSystemObj, ConvertedDir, ConfigFile, XMLDir, WshShell
 Dim customData, msiProperties, InstallDir, ShibdPort
 
 on error resume next
@@ -56,56 +56,14 @@ if (Err = 0) then
   ConfigDir = InstallDir & "\etc\shibboleth\"
   DistDir = ConfigDir & "dist\"
 
+  'Set ConvertedDir as the SHIBSP_PREFIX system variable.
+  Set WshShell = CreateObject("WScript.Shell")
+  WshShell.RegWrite "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\SHIBSP_PREFIX", ConvertedDir, "REG_SZ"
+
   'Perform actual Substitutions
   'Afterwards, if the config file doesn't already exist, copy up to etc/shibboleth
   'Also strip *.in for files in dist
 
-  ConfigFile = DistDir & "attribute-map.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-map.xml")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "attribute-map.xml", false
-  End If
-  If (FileSystemObj.FileExists(DistDir & "attribute-map.xml")) then
-    FileSystemObj.DeleteFile DistDir & "attribute-map.xml", true
-  End If
-  FileSystemObj.MoveFile ConfigFile, DistDir & "attribute-map.xml"
-
-  ConfigFile = DistDir & "attribute-policy.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-policy.xml")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "attribute-policy.xml", false
-  End If
-  If (FileSystemObj.FileExists(DistDir & "attribute-policy.xml")) then
-    FileSystemObj.DeleteFile DistDir & "attribute-policy.xml", true
-  End If
-  FileSystemObj.MoveFile ConfigFile, DistDir & "attribute-policy.xml"
-  
-  ConfigFile = DistDir & "example-metadata.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  If (NOT FileSystemObj.FileExists(ConfigDir & "example-metadata.xml")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "example-metadata.xml", false
-  End If
-  If (FileSystemObj.FileExists(DistDir & "example-metadata.xml")) then
-    FileSystemObj.DeleteFile DistDir & "example-metadata.xml", true
-  End If
-  FileSystemObj.MoveFile ConfigFile, DistDir & "example-metadata.xml"
-
-  ConfigFile = DistDir & "shibboleth.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
-  ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-LOGDIR-@", ConvertedDir & "/var/log/shibboleth"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
-  ReplaceInFile ConfigFile, "   <UnixListener address=""@-VARRUNDIR-@/shib-shar.sock""/>", "<!-- <UnixListener address=""@-VARRUNDIR-@/shib-shar.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""/>"
-  If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth.xml")) then
-    FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth.xml", false
-  End If
-  If (FileSystemObj.FileExists(DistDir & "shibboleth.xml")) then
-    FileSystemObj.DeleteFile DistDir & "shibboleth.xml", true
-  End If
-  FileSystemObj.MoveFile ConfigFile, DistDir & "shibboleth.xml"
-
   ConfigFile = DistDir & "shibd.logger.in"
   ReplaceInFile ConfigFile, "@-PKGLOGDIR-@", ConvertedDir & "/var/log/shibboleth"
   If (NOT FileSystemObj.FileExists(ConfigDir & "shibd.logger")) then
@@ -127,10 +85,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "native.logger"
 
   ConfigFile = DistDir & "apache.config.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
-  ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache.config", false
   End If
@@ -140,10 +96,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache.config"
 
   ConfigFile = DistDir & "apache2.config.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
-  ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache2.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache2.config", false
   End If
@@ -153,10 +107,8 @@ if (Err = 0) then
   FileSystemObj.MoveFile ConfigFile, DistDir & "apache2.config"
 
   ConfigFile = DistDir & "apache22.config.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth"
-  ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth"
-  ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
-  ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
+  ReplaceInFile ConfigFile, "@-PKGLIBDIR-@", ConvertedDir & "/lib/shibboleth"
+  ReplaceInFile ConfigFile, "@-PKGDOCDIR-@", ConvertedDir & "/share/doc/shibboleth"
   If (NOT FileSystemObj.FileExists(ConfigDir & "apache22.config")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "apache22.config", false
   End If
@@ -165,6 +117,13 @@ 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""/>"
+  If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
+    FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth2.xml", false
+  End If
+
   'Now just copy the other non-edited files over as well (if possible)
 
   If (NOT FileSystemObj.FileExists(ConfigDir & "accessError.html")) then
@@ -187,8 +146,12 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "bindingTemplate.html", ConfigDir, false
   End If
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "openssl.cnf")) then
-    FileSystemObj.CopyFile DistDir & "openssl.cnf", ConfigDir, false
+  If (NOT FileSystemObj.FileExists(ConfigDir & "localLogout.html")) then
+    FileSystemObj.CopyFile DistDir & "localLogout.html", ConfigDir, false
+  End If
+
+  If (NOT FileSystemObj.FileExists(ConfigDir & "globalLogout.html")) then
+    FileSystemObj.CopyFile DistDir & "globalLogout.html", ConfigDir, false
   End If
 
   If (NOT FileSystemObj.FileExists(ConfigDir & "console.logger")) then
@@ -199,36 +162,35 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "shibboleth.logger", ConfigDir, false
   End If
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "sp-example.crt")) then
-    FileSystemObj.CopyFile DistDir & "sp-example.crt", ConfigDir, false
+  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
 
-  If (NOT FileSystemObj.FileExists(ConfigDir & "sp-example.key")) then
-    FileSystemObj.CopyFile DistDir & "sp-example.key", ConfigDir, false
+  If (NOT FileSystemObj.FileExists(ConfigDir & "attribute-policy.xml")) then
+    FileSystemObj.CopyFile DistDir & "attribute-policy.xml", ConfigDir, false
   End If
 
   ' Finally, fix up schema catalogs.
   
   XMLDir = InstallDir & "\share\xml\xmltooling\"
-  ConfigFile = XMLDir & "catalog.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir
-  FileSystemObj.MoveFile ConfigFile, XMLDir & "catalog.xml"
+  ConfigFile = XMLDir & "catalog.xml"
+  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
 
   XMLDir = InstallDir & "\share\xml\opensaml\"
-  ConfigFile = XMLDir & "saml20-catalog.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir
-  FileSystemObj.MoveFile ConfigFile, XMLDir & "saml20-catalog.xml"
-  ConfigFile = XMLDir & "saml11-catalog.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir
-  FileSystemObj.MoveFile ConfigFile, XMLDir & "saml11-catalog.xml"
-  ConfigFile = XMLDir & "saml10-catalog.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir
-  FileSystemObj.MoveFile ConfigFile, XMLDir & "saml10-catalog.xml"
+  ConfigFile = XMLDir & "saml20-catalog.xml"
+  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
+  ConfigFile = XMLDir & "saml11-catalog.xml"
+  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
+  ConfigFile = XMLDir & "saml10-catalog.xml"
+  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
 
   XMLDir = InstallDir & "\share\xml\shibboleth\"
-  ConfigFile = XMLDir & "catalog.xml.in"
-  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir
-  FileSystemObj.MoveFile ConfigFile, XMLDir & "catalog.xml"
+  ConfigFile = XMLDir & "catalog.xml"
+  ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
 
 'Last End If
 End If
\ No newline at end of file