Permalink
Browse files

Minor changes to bug fixes for join/create farm

  • Loading branch information...
BrianFarnhill committed Jul 30, 2015
1 parent 916797b commit 6340908510fd1bc1faf0e241435e1d97502749c4
View
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
@@ -1,168 +1,145 @@
function Get-TargetResource
{
[CmdletBinding()]
[OutputType([System.Collections.Hashtable])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
Write-Verbose -Message "Checking for local SP Farm"
$session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
$result = Invoke-Command -Session $session -ScriptBlock {
try {
$spFarm = Get-SPFarm -ErrorAction SilentlyContinue
} catch {
Write-Verbose -Message "Unable to detect local farm."
}
if ($null -eq $spFarm) {return @{ }}
$returnValue = @{
FarmName = $spFarm.Name
}
return $returnValue
}
$result
}
function Set-TargetResource
{
[CmdletBinding()]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
$session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
Write-Verbose -Message "Creating new configuration database"
Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
$params = $args[0]
New-SPConfigurationDatabase -DatabaseName $params.FarmConfigDatabaseName `
-DatabaseServer $params.DatabaseServer `
-Passphrase (ConvertTo-SecureString -String $params.Passphrase -AsPlainText -force) `
-FarmCredentials $params.FarmAccount `
-SkipRegisterAsDistributedCacheHost:$true `
-AdministrationContentDatabaseName $params.AdminContentDatabaseName
}
Write-Verbose -Message "Installing help collection"
Invoke-Command -Session $session -ScriptBlock {
Install-SPHelpCollection -All
}
Write-Verbose -Message "Initialising farm resource security"
Invoke-Command -Session $session -ScriptBlock {
Initialize-SPResourceSecurity
}
Write-Verbose -Message "Installing farm services"
Invoke-Command -Session $session -ScriptBlock {
Install-SPService
}
Write-Verbose -Message "Installing farm features"
Invoke-Command -Session $session -ScriptBlock {
Install-SPFeature -AllExistingFeatures -Force
}
Write-Verbose -Message "Creating Central Administration Website"
Invoke-Command -Session $session -ScriptBlock {
New-SPCentralAdministration -Port 9999 -WindowsAuthProvider NTLM
}
Write-Verbose -Message "Installing application content"
Invoke-Command -Session $session -ScriptBlock {
Install-SPApplicationContent
}
}
function Test-TargetResource
{
[CmdletBinding()]
[OutputType([System.Boolean])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
$result = Get-TargetResource -FarmConfigDatabaseName $FarmConfigDatabaseName -DatabaseServer $DatabaseServer -FarmAccount $FarmAccount -InstallAccount $InstallAccount -Passphrase $Passphrase -AdminContentDatabaseName $AdminContentDatabaseName
if ($result.Count -eq 0) { return $false }
return $true
}
Export-ModuleMember -Function *-TargetResource
function Get-TargetResource
{
[CmdletBinding()]
[OutputType([System.Collections.Hashtable])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
Write-Verbose -Message "Checking for local SP Farm"
$session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
$result = Invoke-Command -Session $session -ScriptBlock {
try {
$spFarm = Get-SPFarm -ErrorAction SilentlyContinue
} catch {
Write-Verbose -Message "Unable to detect local farm."
}
if ($null -eq $spFarm) {return @{ }}
$returnValue = @{
FarmName = $spFarm.Name
}
return $returnValue
}
$result
}
function Set-TargetResource
{
[CmdletBinding()]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
$session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount -ForceNewSession $true
Write-Verbose -Message "Setting up farm"
Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
$params = $args[0]
New-SPConfigurationDatabase -DatabaseName $params.FarmConfigDatabaseName `
-DatabaseServer $params.DatabaseServer `
-Passphrase (ConvertTo-SecureString -String $params.Passphrase -AsPlainText -force) `
-FarmCredentials $params.FarmAccount `
-SkipRegisterAsDistributedCacheHost:$true `
-AdministrationContentDatabaseName $params.AdminContentDatabaseName
Install-SPHelpCollection -All
Initialize-SPResourceSecurity
Install-SPService
Install-SPFeature -AllExistingFeatures -Force
New-SPCentralAdministration -Port 9999 -WindowsAuthProvider NTLM
Install-SPApplicationContent
}
}
function Test-TargetResource
{
[CmdletBinding()]
[OutputType([System.Boolean])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FarmConfigDatabaseName,
[parameter(Mandatory = $true)]
[System.String]
$DatabaseServer,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$FarmAccount,
[parameter(Mandatory = $true)]
[System.Management.Automation.PSCredential]
$InstallAccount,
[parameter(Mandatory = $true)]
[System.String]
$Passphrase,
[parameter(Mandatory = $true)]
[System.String]
$AdminContentDatabaseName
)
$result = Get-TargetResource -FarmConfigDatabaseName $FarmConfigDatabaseName -DatabaseServer $DatabaseServer -FarmAccount $FarmAccount -InstallAccount $InstallAccount -Passphrase $Passphrase -AdminContentDatabaseName $AdminContentDatabaseName
if ($result.Count -eq 0) { return $false }
return $true
}
Export-ModuleMember -Function *-TargetResource
Oops, something went wrong.

0 comments on commit 6340908

Please sign in to comment.