Split x ish server (#40)

* xISHServer artifacts removed. Initial commit * no message
RWS · Dec 20, 2016 · 82e19c0 · 82e19c0
1 parent 43c4674
commit 82e19c0
Show file tree

Hide file tree

Showing 54 changed files with 44 additions and 1,974 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log
 
+## pre-release v0.5
+
+- Removed **xISHServer** module from this repository and moved to [ISHServer](https://github.com/Sarafian/ISHServer).
+- Fixed some issues with the `Restart-Server.ps1` and `Test-Server.ps1` scripts.
+
 ## pre-release v0.4
 
 - All source code has header based on SDL's open source policy.

diff --git a/Examples/Clean-ISH.ps1 b/Examples/Clean-ISH.ps1
@@ -40,14 +40,14 @@ $cleanBlock= {
     $ishDeployProgramDataPath=Join-Path "C:\ProgramData" "ISHDeploy.$ishVersion"
     Write-Debug "ishDeployProgramDataPath=$ishDeployProgramDataPath"
 
-    $ishServerProgramDataPath=Join-Path "C:\ProgramData" "xISHServer.$ishServerVersion"
+    $ishServerProgramDataPath=Join-Path "C:\ProgramData" "ISHServer.$ishServerVersion"
     Write-Debug "ishServerProgramDataPath=$ishServerProgramDataPath"
 
     $ishDeployModuleName="ISHDeploy.$ishVersion"
     Write-Debug "ishDeployModuleName=$ishDeployModuleName"
-    $ishServerModuleName="xISHServer.$ishServerVersion"
+    $ishServerModuleName="ISHServer.$ishServerVersion"
     Write-Debug "ishServerModuleName=$ishServerModuleName"
-    $ishAutomationModuleName="xISHServer.$ishServerVersion"
+    $ishAutomationModuleName="ISHServer.$ishServerVersion"
     Write-Debug "ishServerModuleName=$ishServerModuleName"
 
     Uninstall-Module $ishDeployModuleName -Force

diff --git a/Examples/ISHDeploy/Set-ISHSTSWindows.ImplicitRemoting.ps1 b/Examples/ISHDeploy/Set-ISHSTSWindows.ImplicitRemoting.ps1
@@ -48,7 +48,7 @@ try
     if($Computer)
     {
         $ishServerVersion=($ISHVersion -split "\.")[0]
-        $ishServerModuleName="xISHServer.$ishServerVersion"
+        $ishServerModuleName="ISHServer.$ishServerVersion"
         $ishDelpoyModuleName="ISHDeploy.$ISHVersion"
         $remote=Add-ModuleFromRemote -ComputerName $Computer -Credential $Credential -Name @($ishServerModuleName,$ishDelpoyModuleName)
     }

diff --git a/Examples/Initialize-ISHServer.ps1 b/Examples/Initialize-ISHServer.ps1
@@ -36,17 +36,9 @@ $osUserCredential=Get-ISHBootstrapperContextValue -ValuePath "OSUserCredentialEx
 $ishVersion=Get-ISHBootstrapperContextValue -ValuePath "ISHVersion"
 $ishServerVersion=($ishVersion -split "\.")[0]
 
-if(-not $computerName)
-{
-    Write-Warning "xISHServer will be imported from the repository"
-    Remove-Module -Name xISHServer.12 -ErrorAction SilentlyContinue
-    Remove-Module -Name xISHServer.13 -ErrorAction SilentlyContinue
-    Import-Module "$sourcePath\Modules\xISHServer\xISHServer.$ishServerVersion.psm1"
-}
-
 $installOracle=Get-ISHBootstrapperContextValue -ValuePath "InstallOracle" -DefaultValue $false
 $installMSXML=(($ishVersion -eq "12.0.0") -or ($ishVersion -eq "12.0.1"))
-$isSupported=& $scriptsPaths\xISHServer\Test-SupportedServer.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion
+$isSupported=& $scriptsPaths\ISHServer\Test-SupportedServer.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion
 if(-not $isSupported)
 {
     return
@@ -73,14 +65,14 @@ if($ftp)
 if($unc)
 {
     $prerequisitesSourcePath=$unc.ISHServerFolder
-    & $scriptsPaths\xISHServer\Upload-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -PrerequisitesSourcePath $prerequisitesSourcePath -ISHServerVersion $ishServerVersion
+    & $scriptsPaths\ISHServer\Upload-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -PrerequisitesSourcePath $prerequisitesSourcePath -ISHServerVersion $ishServerVersion
 }
 if($ftp)
 {
-    & $scriptsPaths\xISHServer\Get-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftpHost -FTPCredential $ftpCredential -FTPFolder $ftpISHServerFolder
+    & $scriptsPaths\ISHServer\Get-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftpHost -FTPCredential $ftpCredential -FTPFolder $ftpISHServerFolder
 }
 
-& $scriptsPaths\xISHServer\Install-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -InstallOracle:$installOracle -InstallMSXML4:$installMSXML
+& $scriptsPaths\ISHServer\Install-ISHServerPrerequisites.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -InstallOracle:$installOracle -InstallMSXML4:$installMSXML
 
 if($computerName)
 {
@@ -90,24 +82,24 @@ if($computerName)
         if($useFQDNWithCredSSP)
         {
             $fqdn=[System.Net.Dns]::GetHostByName($computerName)| FL HostName | Out-String | %{ "{0}" -f $_.Split(':')[1].Trim() };
-             & $scriptsPaths\xISHServer\Initialize-ISHServerOSUser.ps1 -Computer $fqdn -Credential $credential -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName) -CredSSP
+             & $scriptsPaths\ISHServer\Initialize-ISHServerOSUser.ps1 -Computer $fqdn -Credential $credential -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName) -CredSSP
         }
         else
         {
             $sessionOptionsWithCredSSP=Get-ISHBootstrapperContextValue -ValuePath "SessionOptionsWithCredSSPExpression" -Invoke
-             & $scriptsPaths\xISHServer\Initialize-ISHServerOSUser.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -SessionOptions $sessionOptionsWithCredSSP -OSUser ($osUserCredential.UserName) -CredSSP
+             & $scriptsPaths\ISHServer\Initialize-ISHServerOSUser.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -SessionOptions $sessionOptionsWithCredSSP -OSUser ($osUserCredential.UserName) -CredSSP
         }
     }
     else
     {
-         & $scriptsPaths\xISHServer\Initialize-ISHServerOSUser.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName)
+         & $scriptsPaths\ISHServer\Initialize-ISHServerOSUser.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName)
     }
-     & $scriptsPaths\xISHServer\Initialize-ISHServerOSUserRegion.ps1 -Computer $computerName -OSUserCredential $osUserCredential -ISHServerVersion $ishServerVersion
+     & $scriptsPaths\ISHServer\Initialize-ISHServerOSUserRegion.ps1 -Computer $computerName -OSUserCredential $osUserCredential -ISHServerVersion $ishServerVersion
 }
 else
 {
-   & $scriptsPaths\xISHServer\Initialize-ISHServerOSUser.ps1 -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName)
-   Write-Warning "Cannot execute $scriptsPaths\xISHServer\Initialize-ISHServerOSUserRegion.ps1 locally."
+   & $scriptsPaths\ISHServer\Initialize-ISHServerOSUser.ps1 -ISHServerVersion $ishServerVersion -OSUser ($osUserCredential.UserName)
+   Write-Warning "Cannot execute $scriptsPaths\ISHServer\Initialize-ISHServerOSUserRegion.ps1 locally."
 }
 
 $webCertificate=Get-ISHBootstrapperContextValue -ValuePath "WebCertificate"
@@ -170,14 +162,14 @@ if($unc)
 {
     if($unc.AntennaHouseLicensePath)
     {
-        & $scriptsPaths\xISHServer\Set-ISHAntennaHouseLicense.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FilePath $unc.AntennaHouseLicensePath
+        & $scriptsPaths\ISHServer\Set-ISHAntennaHouseLicense.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FilePath $unc.AntennaHouseLicensePath
     }
 }
 if($ftp)
 {
     if($ftp.AntennaHouseLicensePath)
     {
-        & $scriptsPaths\xISHServer\Set-ISHAntennaHouseLicense.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftpHost -FTPCredential $ftpCredential -FTPPath $ftp.AntennaHouseLicensePath
+        & $scriptsPaths\ISHServer\Set-ISHAntennaHouseLicense.ps1 -Computer $computerName -Credential $credential -ISHServerVersion $ishServerVersion -FTPHost $ftpHost -FTPCredential $ftpCredential -FTPPath $ftp.AntennaHouseLicensePath
     }
 }
 

diff --git a/Examples/Install-Module.ps1 b/Examples/Install-Module.ps1
@@ -39,21 +39,17 @@ try
     $ishVersion=Get-ISHBootstrapperContextValue -ValuePath "ISHVersion"
     $ishServerVersion=($ishVersion -split "\.")[0]
 
-    $ishServerModuleName="xISHServer.$ishServerVersion"
+	$ishServerRepository=Get-ISHBootstrapperContextValue -ValuePath "ISHServerRepository" -DefaultValue PSGallery
+    $ishServerModuleName="ISHServer.$ishServerVersion"
 
     $ishDeployRepository=Get-ISHBootstrapperContextValue -ValuePath "ISHDeployRepository" -DefaultValue PSGallery
     $ishDeployModuleName="ISHDeploy.$ishVersion"
 
     $scope=Get-ISHBootstrapperContextValue -ValuePath "InstallModuleScope" -DefaultValue "AllUsers"
 
     & $scriptsPaths\PowerShellGet\Install-Module.ps1 -Computer $computerName -Credential $credential -ModuleName @("CertificatePS","PSFTP") -Repository PSGallery -Scope:$scope
+	& $scriptsPaths\PowerShellGet\Install-Module.ps1 -Computer $computerName -Credential $credential -ModuleName $ishServerModuleName -Repository $ishServerRepository -Scope:$scope
     & $scriptsPaths\PowerShellGet\Install-Module.ps1 -Computer $computerName -Credential $credential -ModuleName $ishDeployModuleName -Repository $ishDeployRepository -Scope:$scope
-
-    if($computerName)
-    {
-        $ishServerRepository=Get-ISHBootstrapperContextValue -ValuePath "xISHServerRepository"
-        & $scriptsPaths\PowerShellGet\Install-Module.ps1 -Computer $computerName -Credential $credential -ModuleName $ishServerModuleName -Repository $ishServerRepository
-    }
 }
 finally
 {

diff --git a/Source/Modules/Publish-xISHServer.ps1 b/Source/Modules/Publish-xISHServer.ps1
diff --git a/Source/Modules/xISHServer/Get-ISHCOMPlus.ps1 b/Source/Modules/xISHServer/Get-ISHCOMPlus.ps1
diff --git a/Source/Modules/xISHServer/Get-ISHNETInfo.ps1 b/Source/Modules/xISHServer/Get-ISHNETInfo.ps1
diff --git a/Source/Modules/xISHServer/Get-ISHOSInfo.ps1 b/Source/Modules/xISHServer/Get-ISHOSInfo.ps1