diff --git a/Modules/ArcGIS/ArcGIS.psd1 b/Modules/ArcGIS/ArcGIS.psd1 index e1be34a0..def4d7e2 100644 --- a/Modules/ArcGIS/ArcGIS.psd1 +++ b/Modules/ArcGIS/ArcGIS.psd1 @@ -1,9 +1,9 @@ -# +# # Module manifest for module 'PSGet_ArcGIS' # # Generated by: Esri # -# Generated on: 02/17/2022 +# Generated on: 04/14/2022 # @{ @@ -12,7 +12,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '3.3.1' + ModuleVersion = '3.3.2' # Supported PSEditions # CompatiblePSEditions = @() @@ -107,7 +107,7 @@ # IconUri = '' # ReleaseNotes of this module - ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 3.3.1' + ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 3.3.2' # External dependent modules of this module # ExternalModuleDependencies = '' diff --git a/Modules/ArcGIS/ArcGIS.psm1 b/Modules/ArcGIS/ArcGIS.psm1 index 18e9eb3c..92f9f63d 100644 --- a/Modules/ArcGIS/ArcGIS.psm1 +++ b/Modules/ArcGIS/ArcGIS.psm1 @@ -1,4 +1,4 @@ -function Get-FQDN +function Get-FQDN { [CmdletBinding()] param( @@ -2222,11 +2222,11 @@ function Invoke-ServerUpgradeScript { } $NodeToAdd["ServerRole"] = $ServerRole - if($ServerRole -ine "GeneralPurposeServer" -and ($AdditionalServerRoles.Count -gt 0)){ + if($ServerRole -ieq "GeneralPurposeServer" -and ($AdditionalServerRoles.Count -gt 0)){ $NodeToAdd["AdditionalServerRoles"] = $AdditionalServerRoles } - if($ServerRole -ine "GeoEvent" -and $ServerRole -ine "WorkflowManagerServer"){ + if($ServerRole -ine "GeoEvent" -and $ServerRole -ine "WorkflowManagerServer"){ $ServerLicenseFilePath = $cf.ConfigData.Server.LicenseFilePath $ServerLicensePassword = $null if($cf.ConfigData.Server.LicensePasswordFilePath){ diff --git a/Modules/ArcGIS/ArcGISUtility.psm1 b/Modules/ArcGIS/ArcGISUtility.psm1 index e3646b24..ab0bab1d 100644 --- a/Modules/ArcGIS/ArcGISUtility.psm1 +++ b/Modules/ArcGIS/ArcGISUtility.psm1 @@ -1,4 +1,4 @@ -function ConvertTo-HttpBody($props) +function ConvertTo-HttpBody($props) { [string]$str = '' foreach($prop in $props.Keys){ @@ -546,11 +546,7 @@ function Get-NodeAgentAmazonElementsPresent $File = Join-Path $InstallDir 'framework\etc\NodeAgentExt.xml' if(Test-Path $File){ [xml]$xml = Get-Content $File - if((($xml.NodeAgent.Observers.Observer | Where-Object { $_.platform -ieq 'amazon'}).Length -gt 0) -or ` - ($xml.NodeAgent.Observers.Observer.platform -ieq 'amazon') -or ` - (($xml.NodeAgent.Plugins.Plugin | Where-Object { $_.platform -ieq 'amazon'}).Length -gt 0) -or ` - ($xml.NodeAgent.Plugins.Plugin.platform -ieq 'amazon')) - { + if((Select-Xml -Xml $xml -XPath "//NodeAgent/Observers/Observer[@platform='amazon']").Length -gt 0 -or (Select-Xml -Xml $xml -XPath "//NodeAgent/Plugins/Plugin[@platform='amazon']").Length -gt 0){ Write-Verbose "Amazon elements exist in $File" $Enabled = $true } @@ -572,17 +568,21 @@ function Remove-NodeAgentAmazonElements $File = Join-Path $InstallDir 'framework\etc\NodeAgentExt.xml' if(Test-Path $File){ [xml]$xml = Get-Content $File - if($xml.NodeAgent.Observers.Observer.platform -ieq 'amazon') - { - $xml.NodeAgent.Observers.RemoveChild($xml.NodeAgent.Observers.Observer) - Write-Verbose "Amazon Observer exists in $File. Removing it" - $Changed = $true + if((Select-Xml -Xml $xml -XPath "//NodeAgent/Observers/Observer[@platform='amazon']").Length -gt 0){ + $amazonObserverNode = $xml.NodeAgent.Observers.SelectSingleNode("//Observer[@platform='amazon']") + if($null -ne $amazonObserverNode){ + Write-Verbose "Amazon Observer exists in $File. Removing it" + $amazonObserverNode.ParentNode.RemoveChild($amazonObserverNode) | Out-Null + $Changed = $true + } } - if($xml.NodeAgent.Plugins.Plugin.platform -ieq 'amazon') - { - $xml.NodeAgent.Plugins.RemoveChild($xml.NodeAgent.Plugins.Plugin) - Write-Verbose "Amazon plugin exists in $File. Removing it" - $Changed = $true + if((Select-Xml -Xml $xml -XPath "//NodeAgent/Plugins/Plugin[@platform='amazon']").Length -gt 0){ + $amazonPluginNode = $xml.NodeAgent.Plugins.SelectSingleNode("//Plugin[@platform='amazon']") + if($null -ne $amazonPluginNode){ + Write-Verbose "Amazon plugin exists in $File. Removing it" + $amazonPluginNode.ParentNode.RemoveChild($amazonPluginNode) | Out-Null + $Changed = $true + } } if($Changed) { $xml.Save($File) @@ -1118,7 +1118,7 @@ function Get-ComponentCode } ServerWorkflowManagerClassic = @{ '10.6' = 'F0553C08-337E-4C10-AD64-F2E8A5457483' - '10.6.1' = '0C05EC3A-31E3-4530-B89F-FD51FB4822FB' + '10.6.1' = '816E8417-B450-4449-A660-1B98A4665FF7' '10.7' = 'FBF6F647-730E-40C6-97A2-B309127EFAEE' '10.7.1' = '2CCB468C-1534-4A70-8DBB-79083A01E0E5' '10.8' = 'A32F405C-5DFD-4470-92C6-CFC10514E1C0' @@ -1128,7 +1128,7 @@ function Get-ComponentCode } DesktopWorkflowManagerClassic = @{ '10.6' = 'CB6C6444-6F6B-4FF1-8BFC-46D528D59C50' - '10.6.1' = '816E8417-B450-4449-A660-1B98A4665FF7' + '10.6.1' = '0C05EC3A-31E3-4530-B89F-FD51FB4822FB' '10.7' = '2DD96926-CA3A-4F22-BC37-9396D6AF0994' '10.7.1' = 'FCC76F40-4B99-420B-854F-C0EE4D528090' '10.8' = '952B019D-51A5-4FF9-99F1-0B78108F1AD3' @@ -1512,4 +1512,4 @@ Export-ModuleMember -Function Invoke-ArcGISWebRequest, ConvertTo-HttpBody, Invok Get-ConfiguredHostIdentifier, Set-ConfiguredHostIdentifier, Get-ConfiguredHostName, ` Set-ConfiguredHostName, Get-ConfiguredHostIdentifierType, Get-ComponentCode, Get-ArcGISProductName, ` Test-Install, Convert-PSObjectToHashtable, Get-DataStoreBackupLocation, ` - Invoke-DataStoreConfigureBackupLocationTool, Invoke-DescribeDataStore, Restart-ArcGISService \ No newline at end of file + Invoke-DataStoreConfigureBackupLocationTool, Invoke-DescribeDataStore, Restart-ArcGISService diff --git a/Modules/ArcGIS/Configurations-Azure-2/BaseDeploymentSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/BaseDeploymentSingleTierConfiguration.ps1 index b303b8b5..37492da6 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/BaseDeploymentSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/BaseDeploymentSingleTierConfiguration.ps1 @@ -420,6 +420,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -876,4 +878,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/DataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/DataStoreConfiguration.ps1 index 8563f067..167e96d8 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/DataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/DataStoreConfiguration.ps1 @@ -221,4 +221,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeConfigure.ps1 b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeConfigure.ps1 index 606add4f..27e8faec 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeConfigure.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeConfigure.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeConfigure{ +Configuration DataStoreUpgradeConfigure{ param( [System.Management.Automation.PSCredential] $SiteAdministratorCredential, @@ -37,4 +37,4 @@ Configuration DataStoreUpgradeConfigure{ InstallDir = $InstallDir } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeInstall.ps1 index b8b58e3b..5f950487 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeInstall.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradeInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeInstall{ +Configuration DataStoreUpgradeInstall{ param( [System.String] $Version, @@ -138,4 +138,4 @@ Configuration DataStoreUpgradeInstall{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradePreInstall.ps1 b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradePreInstall.ps1 index 3edbbe08..63038b57 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradePreInstall.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/DataStoreUpgradePreInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradePreInstall{ +Configuration DataStoreUpgradePreInstall{ param( [System.Management.Automation.PSCredential] $ServiceCredential, @@ -31,4 +31,4 @@ Configuration DataStoreUpgradePreInstall{ State = 'Stopped' } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/DiskConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/DiskConfiguration.ps1 index 50cff0b5..5ae1c216 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/DiskConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/DiskConfiguration.ps1 @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/FileShareConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/FileShareConfiguration.ps1 index 6c25c9a6..690b75e6 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/FileShareConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/FileShareConfiguration.ps1 @@ -136,4 +136,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/GISServerMultiTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/GISServerMultiTierConfiguration.ps1 index 1fe3ce22..3d6e5fc9 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/GISServerMultiTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/GISServerMultiTierConfiguration.ps1 @@ -518,6 +518,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -749,4 +751,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/GISServerSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/GISServerSingleTierConfiguration.ps1 index 80a9e188..8ec213c0 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/GISServerSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/GISServerSingleTierConfiguration.ps1 @@ -568,6 +568,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -804,4 +806,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/MissionServerMultiTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/MissionServerMultiTierConfiguration.ps1 index 55b17d8e..db9f4d31 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/MissionServerMultiTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/MissionServerMultiTierConfiguration.ps1 @@ -1,4 +1,4 @@ -Configuration MissionServerMultiTierConfiguration{ +Configuration MissionServerMultiTierConfiguration{ param( [Parameter(Mandatory=$false)] [System.Management.Automation.PSCredential] @@ -461,4 +461,4 @@ Configuration MissionServerMultiTierConfiguration{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/MissionServerSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/MissionServerSingleTierConfiguration.ps1 index 4b45fce9..96bf8dd3 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/MissionServerSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/MissionServerSingleTierConfiguration.ps1 @@ -1,4 +1,4 @@ -Configuration MissionServerSingleTierConfiguration{ +Configuration MissionServerSingleTierConfiguration{ param( [Parameter(Mandatory=$false)] [System.Management.Automation.PSCredential] @@ -481,4 +481,4 @@ Configuration MissionServerSingleTierConfiguration{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/NotebookServerSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/NotebookServerSingleTierConfiguration.ps1 index 99dac0e7..f3d79308 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/NotebookServerSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/NotebookServerSingleTierConfiguration.ps1 @@ -494,4 +494,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/PortalConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/PortalConfiguration.ps1 index 78654a7c..ead35731 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/PortalConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/PortalConfiguration.ps1 @@ -470,4 +470,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/PortalPostUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure-2/PortalPostUpgrade.ps1 index da35ee61..d6fa4c7b 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/PortalPostUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/PortalPostUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration PortalPostUpgrade{ +Configuration PortalPostUpgrade{ param( [parameter(Mandatory = $true)] @@ -72,4 +72,4 @@ Configuration PortalPostUpgrade{ ImportExternalPublicCertAsRoot = $True } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/PortalUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure-2/PortalUpgrade.ps1 index a9bd70b0..29524507 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/PortalUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/PortalUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration PortalUpgrade{ +Configuration PortalUpgrade{ param( [parameter(Mandatory = $true)] @@ -181,4 +181,4 @@ Configuration PortalUpgrade{ DataDir = $DataDirsForPortal } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/SQLServerConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/SQLServerConfiguration.ps1 index a7ff3aed..e3273cc2 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/SQLServerConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/SQLServerConfiguration.ps1 @@ -86,4 +86,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/ServerConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/ServerConfiguration.ps1 index b3ecdc0c..7b730eea 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/ServerConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/ServerConfiguration.ps1 @@ -294,6 +294,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -382,4 +384,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/ServerUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure-2/ServerUpgrade.ps1 index 45c54698..c2bb0e95 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/ServerUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/ServerUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration ServerUpgrade{ +Configuration ServerUpgrade{ param( [System.String] $Version, @@ -242,7 +242,10 @@ Configuration ServerUpgrade{ if($ServerRole -ieq "NotebookServer"){ $ServerLicenseRole = "NotebookServer" } - + if($ServerRole -ieq "MissionServer"){ + $ServerLicenseRole = "MissionServer" + } + ## Download license file if($ServerLicenseFileUrl) { $ServerLicenseFileName = Get-FileNameFromUrl $ServerLicenseFileUrl @@ -279,6 +282,13 @@ Configuration ServerUpgrade{ PsDscRunAsCredential = $ServiceCredential # Copy as arcgis account which has access to this share } + }elseif($ServerRole -ieq "MissionServer"){ + ArcGIS_MissionServerUpgrade MissionServerConfigureUpgrade{ + Ensure = "Present" + Version = $Version + ServerHostName = $MachineFQDN + DependsOn = $Depends + } }else{ ArcGIS_ServerUpgrade ServerConfigureUpgrade{ Ensure = "Present" @@ -376,4 +386,4 @@ Configuration ServerUpgrade{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/SpatiotemporalBigDataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/SpatiotemporalBigDataStoreConfiguration.ps1 index c868201f..fc80fe6f 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/SpatiotemporalBigDataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/SpatiotemporalBigDataStoreConfiguration.ps1 @@ -166,4 +166,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/TileCacheDataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/TileCacheDataStoreConfiguration.ps1 index 2815a319..ae24b431 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/TileCacheDataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/TileCacheDataStoreConfiguration.ps1 @@ -1,4 +1,4 @@ -Configuration TileCacheDataStoreConfiguration{ +Configuration TileCacheDataStoreConfiguration{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -224,4 +224,4 @@ Configuration TileCacheDataStoreConfiguration{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure-2/UpgradeVMFileShareConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure-2/UpgradeVMFileShareConfiguration.ps1 index bdeb3846..d530df77 100644 --- a/Modules/ArcGIS/Configurations-Azure-2/UpgradeVMFileShareConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure-2/UpgradeVMFileShareConfiguration.ps1 @@ -69,4 +69,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/BaseDeploymentSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/BaseDeploymentSingleTierConfiguration.ps1 index 8dbce673..07fec2c5 100644 --- a/Modules/ArcGIS/Configurations-Azure/BaseDeploymentSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/BaseDeploymentSingleTierConfiguration.ps1 @@ -397,6 +397,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -823,4 +825,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/DataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/DataStoreConfiguration.ps1 index ab6fa09b..6e4553d8 100644 --- a/Modules/ArcGIS/Configurations-Azure/DataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/DataStoreConfiguration.ps1 @@ -292,4 +292,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeConfigure.ps1 b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeConfigure.ps1 index 606add4f..27e8faec 100644 --- a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeConfigure.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeConfigure.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeConfigure{ +Configuration DataStoreUpgradeConfigure{ param( [System.Management.Automation.PSCredential] $SiteAdministratorCredential, @@ -37,4 +37,4 @@ Configuration DataStoreUpgradeConfigure{ InstallDir = $InstallDir } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeInstall.ps1 index c78a5ed3..e0a8d390 100644 --- a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeInstall.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradeInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeInstall{ +Configuration DataStoreUpgradeInstall{ param( [System.String] $Version, @@ -198,4 +198,4 @@ Configuration DataStoreUpgradeInstall{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradePreInstall.ps1 b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradePreInstall.ps1 index 3edbbe08..63038b57 100644 --- a/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradePreInstall.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/DataStoreUpgradePreInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradePreInstall{ +Configuration DataStoreUpgradePreInstall{ param( [System.Management.Automation.PSCredential] $ServiceCredential, @@ -31,4 +31,4 @@ Configuration DataStoreUpgradePreInstall{ State = 'Stopped' } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/DiskConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/DiskConfiguration.ps1 index 50cff0b5..5ae1c216 100644 --- a/Modules/ArcGIS/Configurations-Azure/DiskConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/DiskConfiguration.ps1 @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/FileShareConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/FileShareConfiguration.ps1 index 3220dc51..08ef9b68 100644 --- a/Modules/ArcGIS/Configurations-Azure/FileShareConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/FileShareConfiguration.ps1 @@ -278,4 +278,4 @@ subjectAltName = @alt_names DependsOn = if(-Not($IsServiceCredentialDomainAccount)){ @('[User]ArcGIS_RunAsAccount','[File]FileShareLocationPath')}else{ @('[File]FileShareLocationPath')} } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/GISServerFileShareConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/GISServerFileShareConfiguration.ps1 index 03bd0cf6..2113cf0f 100644 --- a/Modules/ArcGIS/Configurations-Azure/GISServerFileShareConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/GISServerFileShareConfiguration.ps1 @@ -113,4 +113,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/GISServerMultiTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/GISServerMultiTierConfiguration.ps1 index c428f64a..f508f602 100644 --- a/Modules/ArcGIS/Configurations-Azure/GISServerMultiTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/GISServerMultiTierConfiguration.ps1 @@ -540,6 +540,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -788,4 +790,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/GISServerSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/GISServerSingleTierConfiguration.ps1 index 3f26c9c2..c7126714 100644 --- a/Modules/ArcGIS/Configurations-Azure/GISServerSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/GISServerSingleTierConfiguration.ps1 @@ -586,6 +586,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -834,4 +836,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/NotebookServerSingleTierConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/NotebookServerSingleTierConfiguration.ps1 index 02e2ea6c..05447c27 100644 --- a/Modules/ArcGIS/Configurations-Azure/NotebookServerSingleTierConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/NotebookServerSingleTierConfiguration.ps1 @@ -488,4 +488,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/PortalConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/PortalConfiguration.ps1 index e5d26164..9e6be1fa 100644 --- a/Modules/ArcGIS/Configurations-Azure/PortalConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/PortalConfiguration.ps1 @@ -413,4 +413,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/PortalPostUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure/PortalPostUpgrade.ps1 index 520be7f9..9e721515 100644 --- a/Modules/ArcGIS/Configurations-Azure/PortalPostUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/PortalPostUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration PortalPostUpgrade{ +Configuration PortalPostUpgrade{ param( [parameter(Mandatory = $true)] @@ -71,4 +71,4 @@ Configuration PortalPostUpgrade{ Version = $Version } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/PortalUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure/PortalUpgrade.ps1 index 0d78703a..76b89f3c 100644 --- a/Modules/ArcGIS/Configurations-Azure/PortalUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/PortalUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration PortalUpgrade{ +Configuration PortalUpgrade{ param( [parameter(Mandatory = $true)] @@ -181,4 +181,4 @@ Configuration PortalUpgrade{ DataDir = $DataDirsForPortal } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/SQLServerConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/SQLServerConfiguration.ps1 index 89e935d0..08e6085f 100644 --- a/Modules/ArcGIS/Configurations-Azure/SQLServerConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/SQLServerConfiguration.ps1 @@ -86,4 +86,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/ServerConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/ServerConfiguration.ps1 index 1d6a1ecf..5871361a 100644 --- a/Modules/ArcGIS/Configurations-Azure/ServerConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/ServerConfiguration.ps1 @@ -286,6 +286,8 @@ { ComponentType = "Server" EnableLogHarvesterPlugin = if($EnableLogHarvesterPlugin -ieq 'true'){$true}else{$false} + Version = "10.9.1" + LogFormat = "csv" DependsOn = $ServerDependsOn } @@ -358,4 +360,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/ServerUpgrade.ps1 b/Modules/ArcGIS/Configurations-Azure/ServerUpgrade.ps1 index 271c0159..cde92ead 100644 --- a/Modules/ArcGIS/Configurations-Azure/ServerUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/ServerUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration ServerUpgrade{ +Configuration ServerUpgrade{ param( [System.String] $Version, @@ -374,4 +374,4 @@ Configuration ServerUpgrade{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/SpatiotemporalBigDataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/SpatiotemporalBigDataStoreConfiguration.ps1 index fc0217e0..76060d1a 100644 --- a/Modules/ArcGIS/Configurations-Azure/SpatiotemporalBigDataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/SpatiotemporalBigDataStoreConfiguration.ps1 @@ -166,4 +166,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/TileCacheDataStoreConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/TileCacheDataStoreConfiguration.ps1 index 98f29b93..e624e469 100644 --- a/Modules/ArcGIS/Configurations-Azure/TileCacheDataStoreConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/TileCacheDataStoreConfiguration.ps1 @@ -1,4 +1,4 @@ -Configuration TileCacheDataStoreConfiguration{ +Configuration TileCacheDataStoreConfiguration{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -225,4 +225,4 @@ Configuration TileCacheDataStoreConfiguration{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/UpgradeVMFileShareConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/UpgradeVMFileShareConfiguration.ps1 index bdeb3846..d530df77 100644 --- a/Modules/ArcGIS/Configurations-Azure/UpgradeVMFileShareConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/UpgradeVMFileShareConfiguration.ps1 @@ -69,4 +69,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-Azure/WebProxyConfiguration.ps1 b/Modules/ArcGIS/Configurations-Azure/WebProxyConfiguration.ps1 index c12e4c14..8bc38c41 100644 --- a/Modules/ArcGIS/Configurations-Azure/WebProxyConfiguration.ps1 +++ b/Modules/ArcGIS/Configurations-Azure/WebProxyConfiguration.ps1 @@ -336,4 +336,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-AzureImageBuild/ArcGISDownloadInstallers.ps1 b/Modules/ArcGIS/Configurations-AzureImageBuild/ArcGISDownloadInstallers.ps1 index b85f3325..ff6499cd 100644 --- a/Modules/ArcGIS/Configurations-AzureImageBuild/ArcGISDownloadInstallers.ps1 +++ b/Modules/ArcGIS/Configurations-AzureImageBuild/ArcGISDownloadInstallers.ps1 @@ -66,4 +66,4 @@ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1 index 105f7e8b..f3905f1b 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISDataStore +Configuration ArcGISDataStore { param( [Parameter(Mandatory=$true)] @@ -65,7 +65,7 @@ Configuration ArcGISDataStore ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_xFirewall Import-DscResource -Name ArcGIS_Service_Account Import-DscResource -Name ArcGIS_DataStore @@ -333,4 +333,4 @@ Configuration ArcGISDataStore PITRState = if($EnablePointInTimeRecovery){ "Enabled" }else{ "Disabled" } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1 index 0a70462f..79a77245 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISDataStoreBackup +Configuration ArcGISDataStoreBackup { param( [Parameter(Mandatory=$False)] @@ -27,7 +27,7 @@ Configuration ArcGISDataStoreBackup ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_DataStoreBackup Node $AllNodes.NodeName @@ -91,4 +91,4 @@ Configuration ArcGISDataStoreBackup } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1 index 25742b46..a03d48ca 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1 @@ -1,7 +1,7 @@ -Configuration ArcGISDataStoreCertificateUpdate +Configuration ArcGISDataStoreCertificateUpdate { Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_DataStore_TLS Node $AllNodes.NodeName @@ -21,4 +21,4 @@ Configuration ArcGISDataStoreCertificateUpdate CertificatePassword = $Node.SSLCertificate.Password } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1 index 06a6fd37..24178fb7 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISFederation +Configuration ArcGISFederation { param( [Parameter(Mandatory=$true)] @@ -61,7 +61,7 @@ Configuration ArcGISFederation ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Federation Node $AllNodes.NodeName @@ -93,4 +93,4 @@ Configuration ArcGISFederation } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1 index 6b252668..a62659a6 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISFileShare +Configuration ArcGISFileShare { param( [Parameter(Mandatory=$true)] @@ -28,7 +28,7 @@ Configuration ArcGISFileShare ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_FileShare Node $AllNodes.NodeName @@ -68,4 +68,4 @@ Configuration ArcGISFileShare DependsOn = $DependsOn } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1 index 9bb08d33..d3480ef2 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISInstall{ +Configuration ArcGISInstall{ param( [Parameter(Mandatory=$false)] [System.Management.Automation.PSCredential] @@ -18,10 +18,11 @@ Configuration ArcGISInstall{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_InstallMsiPackage Import-DscResource -Name ArcGIS_InstallPatch + Import-DscResource -Name ArcGIS_xFirewall Node $AllNodes.NodeName { @@ -191,9 +192,9 @@ Configuration ArcGISInstall{ } if ($ConfigurationData.ConfigData.WorkflowManagerServer.Installer.PatchesDir) { - ArcGIS_InstallPatch ServerInstallPatch + ArcGIS_InstallPatch WorkflowManagerServerInstallPatch { - Name = $ServerTypeName + Name = "WorkflowManagerServer" Version = $ConfigurationData.ConfigData.Version PatchesDir = $ConfigurationData.ConfigData.WorkflowManagerServer.Installer.PatchesDir PatchInstallOrder = $ConfigurationData.ConfigData.WorkflowManagerServer.Installer.PatchInstallOrder @@ -611,8 +612,21 @@ Configuration ArcGISInstall{ EnableMSILogging = $EnableMSILogging Ensure = "Present" } + + ArcGIS_xFirewall Server_FirewallRules + { + Name = "ArcGISLicenseManager" + DisplayName = "ArcGIS License Manager" + DisplayGroup = "ArcGIS License Manager" + Ensure = 'Present' + Access = "Allow" + State = "Enabled" + Profile = ("Domain","Private","Public") + LocalPort = ("27000") + Protocol = "TCP" + } } } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1 index ddc05dfc..a9ea3376 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISLicense +Configuration ArcGISLicense { param( [System.Boolean] @@ -6,7 +6,7 @@ Configuration ArcGISLicense ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_License Node $AllNodes.NodeName @@ -113,4 +113,4 @@ Configuration ArcGISLicense } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1 index f9e319ab..2e102cba 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISMissionServer +Configuration ArcGISMissionServer { param( [Parameter(Mandatory=$true)] @@ -97,7 +97,7 @@ Configuration ArcGISMissionServer ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_MissionServer Import-DscResource -Name ArcGIS_MissionServerSettings Import-DscResource -Name ArcGIS_Server_TLS @@ -328,4 +328,4 @@ Configuration ArcGISMissionServer $DependsOn += "[ArcGIS_Server_TLS]MissionServer_TLS_$($Node.NodeName)" } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1 index af2cff1a..8646d6d0 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISMissionServerSettings{ +Configuration ArcGISMissionServerSettings{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -20,7 +20,7 @@ Configuration ArcGISMissionServerSettings{ Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_MissionServerSettings Node $AllNodes.NodeName @@ -42,4 +42,4 @@ Configuration ArcGISMissionServerSettings{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1 index 6c285076..76a5a0fa 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISNotebookServer +Configuration ArcGISNotebookServer { param( [Parameter(Mandatory=$true)] @@ -105,7 +105,7 @@ Configuration ArcGISNotebookServer ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_NotebookServer Import-DscResource -Name ArcGIS_NotebookPostInstall Import-DscResource -Name ArcGIS_NotebookServerSettings @@ -358,4 +358,4 @@ Configuration ArcGISNotebookServer } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1 index 4aa2357a..d5313223 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISNotebookServerSettings{ +Configuration ArcGISNotebookServerSettings{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -20,7 +20,7 @@ Configuration ArcGISNotebookServerSettings{ Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_NotebookServerSettings Node $AllNodes.NodeName @@ -41,4 +41,4 @@ Configuration ArcGISNotebookServerSettings{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1 index 265d2ef4..8be255f0 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISPortal +Configuration ArcGISPortal { param( [Parameter(Mandatory=$true)] @@ -125,7 +125,7 @@ Configuration ArcGISPortal ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_xFirewall Import-DscResource -Name ArcGIS_Portal Import-DscResource -Name ArcGIS_Service_Account diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1 index 5555f0e8..2c632068 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISPortalSettings{ +Configuration ArcGISPortalSettings{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -23,7 +23,7 @@ Configuration ArcGISPortalSettings{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_PortalSettings Node $AllNodes.NodeName @@ -48,4 +48,4 @@ Configuration ArcGISPortalSettings{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1 index 354a323c..33937345 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISRasterDataStoreItem +Configuration ArcGISRasterDataStoreItem { param( [Parameter(Mandatory=$true)] @@ -32,7 +32,7 @@ Configuration ArcGISRasterDataStoreItem $FileShareLocalPath ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_FileShare Import-DSCResource -Name ArcGIS_DataStoreItem @@ -67,4 +67,4 @@ Configuration ArcGISRasterDataStoreItem DataStorePath = if($ExternalFileSharePath){ $ExternalFileSharePath }else{ "\\$($Node.NodeName)\$($FileShareName)" } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1 index 7e4c8e15..b82c90f5 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISRegisterSQLEGDB{ +Configuration ArcGISRegisterSQLEGDB{ [CmdletBinding()] param ( [Parameter(Mandatory=$true)] @@ -45,7 +45,7 @@ Configuration ArcGISRegisterSQLEGDB{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DSCResource -Name ArcGIS_EGDB Node $AllNodes.NodeName @@ -73,4 +73,4 @@ Configuration ArcGISRegisterSQLEGDB{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1 index 16bfd6eb..2584ef3e 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISServer +Configuration ArcGISServer { param( [Parameter(Mandatory=$true)] @@ -121,7 +121,7 @@ Configuration ArcGISServer ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_xFirewall Import-DscResource -Name ArcGIS_Server Import-DscResource -Name ArcGIS_Service_Account @@ -671,4 +671,4 @@ Configuration ArcGISServer } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1 index ac65ca18..59d21d53 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISServerSettings{ +Configuration ArcGISServerSettings{ param( [Parameter(Mandatory=$true)] [ValidateNotNullorEmpty()] @@ -24,7 +24,7 @@ Configuration ArcGISServerSettings{ Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_ServerSettings Node $AllNodes.NodeName @@ -49,4 +49,4 @@ Configuration ArcGISServerSettings{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1 index bae8e59a..760599e3 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISUninstall +Configuration ArcGISUninstall { param( [Parameter(Mandatory=$false)] @@ -14,7 +14,7 @@ Configuration ArcGISUninstall $ServiceCredentialIsMSA = $false ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_FileShare Import-DscResource -Name ArcGIS_InstallMsiPackage diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1 index 4dffc1f6..aa85c62e 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1 @@ -1,4 +1,4 @@ -Configuration ArcGISWebAdaptor +Configuration ArcGISWebAdaptor { param( [System.Management.Automation.PSCredential] @@ -24,7 +24,7 @@ Configuration ArcGISWebAdaptor ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_xFirewall Import-DscResource -Name ArcGIS_IIS_TLS Import-DscResource -Name ArcGIS_WebAdaptor @@ -107,4 +107,4 @@ Configuration ArcGISWebAdaptor } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/DeployWebApp.ps1 b/Modules/ArcGIS/Configurations-OnPrem/DeployWebApp.ps1 index e90003f4..f9a6de48 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/DeployWebApp.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/DeployWebApp.ps1 @@ -1,4 +1,4 @@ -Configuration DeployWebApp +Configuration DeployWebApp { param( [System.String] @@ -40,4 +40,4 @@ Configuration DeployWebApp Force = $true } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1 b/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1 index 349fbaf5..3e84dbe3 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1 @@ -1,4 +1,4 @@ -Configuration PublishGISService +Configuration PublishGISService { [CmdletBinding()] param ( @@ -35,7 +35,7 @@ Configuration PublishGISService ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Server_Service Node $AllNodes.NodeName diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1 index 94991144..fe0cbe1e 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeConfigure{ +Configuration DataStoreUpgradeConfigure{ param( [System.String] $Version, @@ -17,7 +17,7 @@ Configuration DataStoreUpgradeConfigure{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_DataStoreUpgrade Node $AllNodes.NodeName { @@ -39,4 +39,4 @@ Configuration DataStoreUpgradeConfigure{ InstallDir = $InstallDir } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1 index 5e0c376f..385d36b7 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradeInstall{ +Configuration DataStoreUpgradeInstall{ param( [System.String] $Version, @@ -32,7 +32,7 @@ Configuration DataStoreUpgradeInstall{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_InstallPatch Import-DscResource -Name ArcGIS_DataStoreUpgrade @@ -165,4 +165,4 @@ Configuration DataStoreUpgradeInstall{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1 index afa0d4c8..39ddf894 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1 @@ -1,4 +1,4 @@ -Configuration DataStoreUpgradePreInstall +Configuration DataStoreUpgradePreInstall { param( [Parameter(Mandatory=$true)] @@ -7,7 +7,7 @@ Configuration DataStoreUpgradePreInstall ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Node $AllNodes.NodeName { @@ -27,4 +27,4 @@ Configuration DataStoreUpgradePreInstall } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1 index 9346e3ca..7fd51d54 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1 @@ -1,4 +1,4 @@ -Configuration InsightsUpgradeInstall{ +Configuration InsightsUpgradeInstall{ param( [System.String] $Version, @@ -29,7 +29,7 @@ Configuration InsightsUpgradeInstall{ $EnableMSILogging = $false ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_InstallPatch @@ -67,4 +67,4 @@ Configuration InsightsUpgradeInstall{ } } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1 index 0a296ca1..d4a52872 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1 @@ -1,10 +1,10 @@ -Configuration InsightsUpgradeUninstall{ +Configuration InsightsUpgradeUninstall{ param( [System.String] $Version ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Node $AllNodes.NodeName @@ -23,4 +23,4 @@ Configuration InsightsUpgradeUninstall{ Ensure = "Absent" } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgradeV2.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgradeV2.ps1 index dc43d8c0..af2569ca 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgradeV2.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgradeV2.ps1 @@ -1,4 +1,4 @@ -Configuration PortalPostUpgradeV2 { +Configuration PortalPostUpgradeV2 { param( [parameter(Mandatory = $true)] @@ -15,7 +15,7 @@ Configuration PortalPostUpgradeV2 { ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_PortalUpgrade Node $AllNodes.NodeName { @@ -39,4 +39,4 @@ Configuration PortalPostUpgradeV2 { Version = $Version } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeStandbyJoinV1.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeStandbyJoinV1.ps1 index e8173732..6ea044f6 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeStandbyJoinV1.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeStandbyJoinV1.ps1 @@ -1,4 +1,4 @@ -Configuration PortalUpgradeStandbyJoinV1{ +Configuration PortalUpgradeStandbyJoinV1{ param( [parameter(Mandatory = $true)] [System.String] @@ -49,7 +49,7 @@ Configuration PortalUpgradeStandbyJoinV1{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Portal if($null -ne $CloudStorageType) @@ -123,4 +123,4 @@ Configuration PortalUpgradeStandbyJoinV1{ EmailSettingsEncryptionMethod = "NONE" } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV1.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV1.ps1 index 7b4baec4..72844dc6 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV1.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV1.ps1 @@ -1,4 +1,4 @@ -Configuration PortalUpgradeV1{ +Configuration PortalUpgradeV1{ param( [parameter(Mandatory = $true)] [System.String] @@ -99,7 +99,7 @@ Configuration PortalUpgradeV1{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_InstallPatch Import-DscResource -Name ArcGIS_License @@ -340,4 +340,4 @@ Configuration PortalUpgradeV1{ $Depends += '[ArcGIS_Service_Account]Portal_RunAs_Account' } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV2.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV2.ps1 index 3859497b..0ad6eb3e 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV2.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgradeV2.ps1 @@ -1,4 +1,4 @@ -Configuration PortalUpgradeV2{ +Configuration PortalUpgradeV2{ param( [parameter(Mandatory = $true)] [System.String] @@ -42,7 +42,7 @@ Configuration PortalUpgradeV2{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_Service_Account Import-DscResource -Name ArcGIS_InstallPatch @@ -129,4 +129,4 @@ Configuration PortalUpgradeV2{ } $Depends += '[ArcGIS_Service_Account]Portal_RunAs_Account' } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1 index a7fc4453..06b82bae 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration ServerUpgrade{ +Configuration ServerUpgrade{ param( [parameter(Mandatory = $true)] [System.String] @@ -75,7 +75,7 @@ Configuration ServerUpgrade{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_License Import-DscResource -Name ArcGIS_ServerUpgrade @@ -152,6 +152,17 @@ Configuration ServerUpgrade{ $Depends += '[ArcGIS_Install]ServerUpgrade' if($ServerTypeName -ieq "Server" -and $null -ne $Extensions){ + if($Version -ieq "10.9.1"){ + ArcGIS_Install "ServerUpgradeUninstallWorkflowManagerClasicExtension" + { + Name = "ServerWorkflowManagerClassic" + Version = $OldVersion + Ensure = "Absent" + DependsOn = $Depends + } + $Depends += '[ArcGIS_Install]ServerUpgradeUninstallWorkflowManagerClasicExtension' + } + if($MajorVersion -gt 8){ ArcGIS_Install "ServerUpgradeUninstallLocationReferencingExtension" { @@ -265,7 +276,7 @@ Configuration ServerUpgrade{ Ensure = "Present" Component = 'Server' ServerRole = $Node.ServerRole - AdditionalServerRoles = if($Node.ServerRole -ieq "GeneralPurposeServer" -and $Node.AdditionalServerRoles){ ( $Node.AdditionalServerRoles | Where-Object {$_ -ine 'GeoEvent' -and $_ -ine 'NotebookServer' -and $_ -ine 'WorkflowManagerServer' -and $_ -ine 'MissionServer'}) }else{ $null } + AdditionalServerRoles = if($Node.ServerRole -ieq "GeneralPurposeServer" -and $Node.AdditionalServerRoles){ if(($Node.AdditionalServerRoles | Where-Object {$_ -ine 'GeoEvent' -and $_ -ine 'NotebookServer' -and $_ -ine 'WorkflowManagerServer' -and $_ -ine 'MissionServer'}).Count -gt 0){ $Node.AdditionalServerRoles | Where-Object {$_ -ine 'GeoEvent' -and $_ -ine 'NotebookServer' -and $_ -ine 'WorkflowManagerServer' -and $_ -ine 'MissionServer'} }else{$null} }else{ $null } Force = $True DependsOn = $Depends } @@ -298,7 +309,7 @@ Configuration ServerUpgrade{ $Depends += "[ArcGIS_License]WorkflowManagerServerLicense$($Node.NodeName)" } - if($ServerRole -ieq "NotebookServer"){ + if($Node.ServerRole -ieq "NotebookServer"){ ArcGIS_NotebookServerUpgrade NotebookServerConfigureUpgrade{ Ensure = "Present" Version = $Version @@ -326,7 +337,7 @@ Configuration ServerUpgrade{ } } } - }elseif($ServerRole -ieq "MissionServer"){ + }elseif($Node.ServerRole -ieq "MissionServer"){ ArcGIS_MissionServerUpgrade MissionServerConfigureUpgrade{ Ensure = "Present" Version = $Version @@ -467,4 +478,4 @@ Configuration ServerUpgrade{ $Depends += "[ArcGIS_Service_Account]GeoEvent_RunAs_Account_Update" } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1 index dac3114a..c267eca1 100644 --- a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1 +++ b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1 @@ -1,4 +1,4 @@ -Configuration WebAdaptorUpgrade{ +Configuration WebAdaptorUpgrade{ param( [ValidateSet("ServerWebAdaptor","PortalWebAdaptor")] [System.String] @@ -39,7 +39,7 @@ Configuration WebAdaptorUpgrade{ ) Import-DscResource -ModuleName PSDesiredStateConfiguration - Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.1 + Import-DscResource -ModuleName ArcGIS -ModuleVersion 3.3.2 Import-DscResource -Name ArcGIS_Install Import-DscResource -Name ArcGIS_WebAdaptor @@ -120,4 +120,4 @@ Configuration WebAdaptorUpgrade{ DependsOn = $Depends } } -} \ No newline at end of file +} diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.psm1 index a0889993..442e1427 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Configures Datastore with the GIS server. - Can be a primary or secondary in case of Relational DataStore. @@ -963,4 +963,4 @@ function Set-PITRState } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.schema.mof index 6560fb08..a1207645 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore/ArcGIS_DataStore.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStore")] class ArcGIS_DataStore : OMI_BaseResource { @@ -12,4 +12,4 @@ class ArcGIS_DataStore : OMI_BaseResource [Write, Description("Is Tile Cache DataStore Clustered")] Boolean IsTileCacheDataStoreClustered; [Write, Description("Is Failover Enabled when service on Primary machine is stopped.")] Boolean EnableFailoverOnPrimaryStop; [Write, ValueMap{"Enabled","Disabled"}, Values{"Enabled","Disabled"}] String PITRState; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.psm1 index a5ada5d5..ccc6934f 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.psm1 @@ -1,4 +1,4 @@ - + function Get-TargetResource { [CmdletBinding()] @@ -384,4 +384,4 @@ function Test-TargetResource $result } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.schema.mof index 3ac1168b..28e40641 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreBackup/ArcGIS_DataStoreBackup.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStoreBackup")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStoreBackup")] class ArcGIS_DataStoreBackup : OMI_BaseResource { [Key, ValueMap{"Relational","TileCache","SpatioTemporal"}, Values{"Relational","TileCache","SpatioTemporal"}] String DataStoreType; @@ -9,4 +9,4 @@ class ArcGIS_DataStoreBackup : OMI_BaseResource [Write] Boolean IsDefault; [Write] Boolean ForceDefaultRelationalBackupUpdate; [Write] Boolean ForceCloudCredentialsUpdate; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.psm1 index 0f6422bb..43d90357 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Configures A Datastore Item with the GIS server. ("Folder","CloudStore","RasterStore","BigDataFileShare") .PARAMETER Name diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.schema.mof index 58592c6e..802ef813 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreItem/ArcGIS_DataStoreItem.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStoreItem")] class ArcGIS_DataStoreItem : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.psm1 index 0b1ea865..e64c1e4c 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Supports configuration changes and Updates for the Datastore configured with the Server .PARAMETER Ensure @@ -278,4 +278,4 @@ function Get-DataStoreInfo -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.schema.mof index 7cbd259a..6c43c384 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStoreUpgrade/ArcGIS_DataStoreUpgrade.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStoreUpgrade")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStoreUpgrade")] class ArcGIS_DataStoreUpgrade : OMI_BaseResource { [Key] String ServerHostName; @@ -6,4 +6,4 @@ class ArcGIS_DataStoreUpgrade : OMI_BaseResource [Write, EmbeddedInstance("MSFT_Credential")] String SiteAdministrator; [Write] String ContentDirectory; [Write] String InstallDir; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.psm1 index f9d14cea..2fb21358 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -202,4 +202,4 @@ function Invoke-DataStoreUpdateSSLCertificateTool $result } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.schema.mof index e47b2cdb..bff86679 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_DataStore_TLS/ArcGIS_DataStore_TLS.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_DataStore_TLS")] class ArcGIS_DataStore_TLS : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.psm1 index 725c3bfa..36bdff1a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.psm1 @@ -1,4 +1,4 @@ -# +# # ArcGIS_Disk: DSC resource to resize the OS (System) Disk Drive # diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.schema.mof index ac8e8a7c..18cfd596 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Disk/ArcGIS_Disk.schema.mof @@ -1,7 +1,7 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Disk")] class ArcGIS_Disk : OMI_BaseResource { [key] string DriveLetter; [write] uint32 SizeInGB; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.psm1 index 17760567..3ad19357 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Configures a Refrenced or Managed Geo Database .PARAMETER Ensure @@ -786,7 +786,7 @@ function Register-EGDBWithServerSite $item = @{ type = 'egdb' info = @{ - dataStoreConnectionType = 'serverOnly' + dataStoreConnectionType = if($IsManaged){'serverOnly'}else{'shared'} isManaged = $IsManaged connectionString = $ConnString } diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.schema.mof index fef6bf9a..56fd0cc7 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/ArcGIS_EGDB.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_EGDB")] class ArcGIS_EGDB : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file.py b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file.py index 03903f29..559d76ee 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file.py +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file.py @@ -1,4 +1,4 @@ -""" +""" Name: create_connection_file.py Description: Creates a connection file to a SQL Server or PostgreSQL database as the input user credentials. Type create_connection_file.py -h or create_connection_file.py --help for usage diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file_3x.py b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file_3x.py index e5fd8304..38cfdebd 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file_3x.py +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/create_connection_file_3x.py @@ -1,4 +1,4 @@ -""" +""" Name: create_connection_file.py Description: Creates a connection file to a SQL Server or PostgreSQL database as the input user credentials. Type create_connection_file.py -h or create_connection_file.py --help for usage diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb.py b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb.py index 4e8430f4..040abf06 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb.py +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb.py @@ -1,4 +1,4 @@ -""" +""" Name: enable_enterprise_gdb.py Description: Creates a connection file to a SQL Server or PostgreSQL database as the input user credentials and enables an enterprise geodatabase. Type enable_enterprise_gdb.py -h or enable_enterprise_gdb.py --help for usage diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb_3x.py b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb_3x.py index 628db5aa..22bf54d4 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb_3x.py +++ b/Modules/ArcGIS/DSCResources/ArcGIS_EGDB/enable_enterprise_gdb_3x.py @@ -1,4 +1,4 @@ -""" +""" Name: enable_enterprise_gdb.py Description: Creates a connection file to a SQL Server or PostgreSQL database as the input user credentials and enables an enterprise geodatabase. Type enable_enterprise_gdb.py -h or enable_enterprise_gdb.py --help for usage diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1 index 63696ba2..fe284c8c 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Federates a Server with an existing Portal. .PARAMETER Ensure @@ -901,4 +901,4 @@ function Update-SecurityConfigForServer } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.schema.mof index ba62ce0d..f04b5d17 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Federation")] class ArcGIS_Federation : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.psm1 index a57a05b2..93ecf5ab 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Creates a File Share for the Server and Portal to be shared in a High Availabilty Setup. .PARAMETER Ensure @@ -303,4 +303,4 @@ Function Test-FileSharePath } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.schema.mof index 20433d1a..c882e3fa 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_FileShare/ArcGIS_FileShare.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_FileShare")] class ArcGIS_FileShare : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.psm1 index 96d41b2b..77879e5b 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Server to create a New Server Site or Join it to an existing Server Site .PARAMETER Ensure diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.schema.mof index f3978640..d1e7cb46 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_GeoEvent/ArcGIS_GeoEvent.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_GeoEvent")] class ArcGIS_GeoEvent : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.psm1 index ac9bef36..1005c88b 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Check for an SSL Certificate. If not present Installs and Configures the SSL Certificate. If certifcate not provided, creates a self signed certificate and configures it. .PARAMETER Ensure diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.schema.mof index 1bb5d376..bccfcf43 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_IIS_TLS/ArcGIS_IIS_TLS.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_IIS_TLS")] class ArcGIS_IIS_TLS : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.psm1 index 700ea5c1..5d019887 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Installs a given component of the ArcGIS Enterprise Stack. .PARAMETER Ensure @@ -489,4 +489,4 @@ function Test-TargetResource } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.schema.mof index 261bfe51..0fae5db4 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Install/ArcGIS_Install.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Install")] class ArcGIS_Install : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.psm1 index 6809a775..b44af382 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Installs a given msi .PARAMETER Ensure diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.schema.mof index afb14641..bf059c43 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_InstallMsiPackage/ArcGIS_InstallMsiPackage.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_InstallMsiPackage")] class ArcGIS_InstallMsiPackage : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1 index 97b73204..8bd57b0a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Installs a given component of the ArcGIS Enterprise Stack. .PARAMETER Ensure @@ -406,4 +406,4 @@ function Get-MSPqfeID { } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.schema.mof index a9d0d6a3..2095bf93 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_InstallPatch")] class ArcGIS_InstallPatch : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.psm1 index 74c1f09b..51cc8e91 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Licenses the product (Server or Portal) depending on the params specified. .PARAMETER Ensure @@ -394,4 +394,4 @@ function Invoke-LicenseSoftware Write-Verbose "Finished Licensing Product [$Product]" -Verbose } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.schema.mof index eccc9169..99a09804 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_License/ArcGIS_License.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_License")] class ArcGIS_License : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.psm1 index 9ca350c8..13be591d 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to Harvest ArcGIS Enterprise Component logs in a standardized format using Log Harvestor Plugin .PARAMETER HostName @@ -25,14 +25,22 @@ function Get-TargetResource [System.String] $ComponentType, + [parameter(Mandatory = $true)] + [System.String] + $Version, + [parameter(Mandatory = $true)] [System.Boolean] $EnableLogHarvesterPlugin, [parameter(Mandatory = $False)] [System.String] - $LogOutputFolder = "C:\\ArcGIS\\ServerLogs" + $LogOutputFolder = "C:\\ArcGIS\\ServerLogs", + [ValidateSet("csv", "json")] + [parameter(Mandatory = $False)] + [System.String] + $LogFormat = "csv" ) Import-Module $PSScriptRoot\..\..\ArcGISUtility.psm1 -Verbose:$false } @@ -45,19 +53,28 @@ function Set-TargetResource [parameter(Mandatory = $false)] [System.String] $HostName, - + [ValidateSet("Server")] [parameter(Mandatory = $true)] [System.String] $ComponentType, - + + [parameter(Mandatory = $true)] + [System.String] + $Version, + [parameter(Mandatory = $true)] [System.Boolean] $EnableLogHarvesterPlugin, [parameter(Mandatory = $False)] [System.String] - $LogOutputFolder = "C:\\ArcGIS\\ServerLogs" + $LogOutputFolder = "C:\\ArcGIS\\ServerLogs", + + [ValidateSet("csv", "json")] + [parameter(Mandatory = $False)] + [System.String] + $LogFormat = "csv" ) Import-Module $PSScriptRoot\..\..\ArcGISUtility.psm1 -Verbose:$false @@ -69,16 +86,22 @@ function Set-TargetResource $RegKey = Get-EsriRegistryKeyForService -ServiceName $ServiceName $InstallDir =(Get-ItemProperty -Path $RegKey -ErrorAction Ignore).InstallDir $NodeAgentFilePath = Join-Path $InstallDir 'framework\etc\NodeAgentExt.xml' + $MajorVersion = $Version.Split(".")[0] + $UsesLog4j = ($Version -ine "10.9.1" -and $MajorVersion -le 10) if($EnableLogHarvesterPlugin){ - #Create Log4j-XML.jar Archive - $LogXMLFilePath = Join-Path $PSScriptRoot 'LogHarvesterSample.xml' - [xml]$xml = Get-Content $LogXMLFilePath $ServerObserverFolderPath = Join-Path $InstallDir 'framework\lib\server\observers' - $Log4jxmlFilePath = Join-Path $ServerObserverFolderPath 'log4j.xml' - #Update Output File Paths - (($xml.configuration.appender | Where-Object { $_.name -eq "file-services-logs" }).param | Where-Object { $_.name -eq "file" }).value = ( $LogOutputFolder.trimend('\') + "\\services.log" ) - (($xml.configuration.appender | Where-Object { $_.name -eq "file-server-logs" }).param | Where-Object { $_.name -eq "file" }).value = ( $LogOutputFolder.trimend('\') + "\\server.log" ) - + $SampleXMLFile = if($UsesLog4j){'LogHarvesterSample.xml'}else{'LogHarvesterSample2.xml'} + $LogXMLFilePath = Join-Path $PSScriptRoot $SampleXMLFile + [xml]$xml = Get-Content $LogXMLFilePath + $DestXMLFileName = if($UsesLog4j){'log4j.xml'}else{ 'log4j2.xml'} + $Log4jxmlFilePath = Join-Path $ServerObserverFolderPath $DestXMLFileName + if($UsesLog4j){ + (($xml.configuration.appender | Where-Object { $_.name -eq "file-services-logs" }).param | Where-Object { $_.name -eq "file" }).value = ( $LogOutputFolder.trimend('\') + "\\services.log" ) + (($xml.configuration.appender | Where-Object { $_.name -eq "file-server-logs" }).param | Where-Object { $_.name -eq "file" }).value = ( $LogOutputFolder.trimend('\') + "\\server.log" ) + }else{ + ($xml.Configuration.Properties.Property | Where-Object { $_.name -eq "log.dir" })."#text" = $LogOutputFolder.trimend('\') + ($xml.Configuration.Properties.Property | Where-Object { $_.name -eq "log.format" })."#text" = $LogFormat + } $xml.Save($Log4jxmlFilePath) $Log4jXMLZipPath = (Join-Path $ServerObserverFolderPath 'log4j-xml.zip') Compress-Archive -LiteralPath $Log4jxmlFilePath -CompressionLevel Optimal -DestinationPath $Log4jXMLZipPath @@ -128,7 +151,11 @@ function Set-TargetResource } } - #Restart Component + if(-not($UsesLog4j)){ + [Environment]::SetEnvironmentVariable("ARCGIS_LOG_APPENDER", "agol", 'Machine') + } + + # Restart Component Restart-ArcGISService -ServiceName $ServiceName -Verbose if($ComponentType -eq "Server"){ @@ -151,15 +178,24 @@ function Test-TargetResource [ValidateSet("Server")] [parameter(Mandatory = $true)] [System.String] - $ComponentType, - + $ComponentType, + + [parameter(Mandatory = $true)] + [System.String] + $Version, + [parameter(Mandatory = $true)] [System.Boolean] $EnableLogHarvesterPlugin, [parameter(Mandatory = $False)] [System.String] - $LogOutputFolder = "C:\\ArcGIS\\ServerLogs" + $LogOutputFolder = "C:\\ArcGIS\\ServerLogs", + + [ValidateSet("csv", "json")] + [parameter(Mandatory = $False)] + [System.String] + $LogFormat = "csv" ) Import-Module $PSScriptRoot\..\..\ArcGISUtility.psm1 -Verbose:$false @@ -215,4 +251,4 @@ function Get-NodeAgentServerLogHarvestorPresent } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.schema.mof index 83eb546f..6997519a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/ArcGIS_LogHarvester.schema.mof @@ -1,9 +1,11 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_LogHarvester")] class ArcGIS_LogHarvester : OMI_BaseResource { [Write] String HostName; [Key, ValueMap{"Server"}, Values{"Server"}] String ComponentType; + [Write] String Version; [Write, Description("Enable Harvester Plugin for Server and Service Logs")] Boolean EnableLogHarvesterPlugin; [Write] String LogOutputFolder; + [Write, ValueMap{"csv","json"}, Values{"csv","json"}] String LogFormat; }; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample.xml b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample.xml index e44062a8..05cfccad 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample.xml +++ b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample.xml @@ -1,4 +1,4 @@ - + @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample2.xml b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample2.xml new file mode 100644 index 00000000..0438e38a --- /dev/null +++ b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/LogHarvesterSample2.xml @@ -0,0 +1,49 @@ + + + + C:\\arcgisserver\\logs2 + csv + + + + + %mdc{time}, %mdc{type}, %mdc{code}, %mdc{source}, %mdc{methodName}, %mdc{machine}, %mdc{process}, %mdc{thread}, %mdc{elapsed}, %mdc{requestId}, %mdc{user}, [%msg]%n + + + + + %mdc{time}, %mdc{type}, %mdc{code}, %mdc{source}, %mdc{methodName}, %mdc{machine}, %mdc{process}, %mdc{thread}, %mdc{elapsed}, %mdc{requestId}, %mdc{user}, [%msg]%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/log4j.dtd b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/log4j.dtd index e8f79b98..a1103d4a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/log4j.dtd +++ b/Modules/ArcGIS/DSCResources/ArcGIS_LogHarvester/log4j.dtd @@ -1,4 +1,4 @@ - + \ No newline at end of file +> diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.psm1 index be067068..54513080 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Mission Server to create a New Server Site .PARAMETER ServerHostName @@ -691,4 +691,4 @@ function Invoke-DeleteSite Write-Verbose ($response | ConvertTo-Json -Depth 5) } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.schema.mof index 93ee1175..ac59e940 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServer/ArcGIS_MissionServer.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_MissionServer")] class ArcGIS_MissionServer : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.psm1 index bb1fc633..8a08151e 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Mission Server to set the Web Context & Web Socket URL .PARAMETER ServerHostName @@ -215,4 +215,4 @@ function Set-AdminSettings } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.schema.mof index 096d1e41..9cd9c145 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerSettings/ArcGIS_MissionServerSettings.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_MissionServerSettings")] class ArcGIS_MissionServerSettings : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.psm1 index e29b81a1..307be808 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to aid post upgrade completion workflows. This resource upgrades the Mission Server Site once Server Installer has completed the upgrade. .PARAMETER Ensure @@ -130,4 +130,4 @@ function Test-TargetResource } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.schema.mof index 528d6b33..4a72bff0 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_MissionServerUpgrade/ArcGIS_MissionServerUpgrade.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_MissionServerUpgrade")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_MissionServerUpgrade")] class ArcGIS_MissionServerUpgrade : OMI_BaseResource { [Key] String ServerHostName; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.psm1 index ea6e9e29..e8943979 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource { +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] param @@ -146,4 +146,4 @@ function Invoke-PostInstallUtility -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.schema.mof index 5bd6f87d..2b3527b7 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookPostInstall/ArcGIS_NotebookPostInstall.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_NotebookPostInstall")] class ArcGIS_NotebookPostInstall : OMI_BaseResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.psm1 index 0288b9f1..f468b222 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Notebook Server to create a New Server Site .PARAMETER ServerHostName @@ -704,4 +704,4 @@ function Invoke-DeleteSite Write-Verbose ($response | ConvertTo-Json -Depth 5) } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.schema.mof index 0b54eb5a..51d32fe6 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServer/ArcGIS_NotebookServer.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_NotebookServer")] class ArcGIS_NotebookServer : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.psm1 index ed33f221..c0b8ec70 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Notebook Server to set the Web Context URL .PARAMETER ServerHostName @@ -179,4 +179,4 @@ function Set-AdminSettings } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.schema.mof index a637503d..daac52c4 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerSettings/ArcGIS_NotebookServerSettings.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_NotebookServerSettings")] class ArcGIS_NotebookServerSettings : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.psm1 index c90aa3bc..0215ce88 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to aid post upgrade completion workflows. This resource upgrades the Notebook Server Site once Server Installer has completed the upgrade. .PARAMETER Ensure @@ -130,4 +130,4 @@ function Test-TargetResource } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.schema.mof index 15e6b91f..43550415 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_NotebookServerUpgrade/ArcGIS_NotebookServerUpgrade.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_NotebookServerUpgrade")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_NotebookServerUpgrade")] class ArcGIS_NotebookServerUpgrade : OMI_BaseResource { [Key] String ServerHostName; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.psm1 index 79d74495..0d0e79bf 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to Configure a Portal site. .PARAMETER Ensure @@ -1644,4 +1644,4 @@ function Delete-PortalEmailSettings } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.schema.mof index 827a42aa..a1fd7a5f 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Portal/ArcGIS_Portal.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Portal")] class ArcGIS_Portal : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1 index eb1cb2c9..eec18323 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -434,4 +434,4 @@ function UnRegister-WebAdaptorForPortal { } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.schema.mof index 4a732b5b..0e761441 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_PortalSettings")] class ArcGIS_PortalSettings : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.psm1 index 2c2d82aa..6c68f825 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -139,4 +139,4 @@ function Set-TargetResource } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.schema.mof index f1ff7fde..25fb99df 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUnregister/ArcGIS_PortalUnregister.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_PortalUnregister")] class ArcGIS_PortalUnregister : OMI_BaseResource { @@ -6,4 +6,4 @@ class ArcGIS_PortalUnregister : OMI_BaseResource [Key] String StandbyMachine; [Write, EmbeddedInstance("MSFT_Credential")] String PortalAdministrator; [Write] String Version; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.psm1 index 82ead0bf..7a68308e 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -606,4 +606,4 @@ function Test-IfLivingAtlasUpgraded $Result } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.schema.mof index 486a7fe8..df8a328f 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_PortalUpgrade/ArcGIS_PortalUpgrade.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_PortalUpgrade")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_PortalUpgrade")] class ArcGIS_PortalUpgrade : OMI_BaseResource { [Key] String PortalHostName; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.psm1 index edbc2095..8fd890db 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Creates a SelfSigned Certificate or Installs a SSL Certificated Provided and Configures it with Portal. .PARAMETER Ensure @@ -529,4 +529,4 @@ function Update-PortalSSLCertificate Invoke-ArcGISWebRequest -Url $URL -HttpFormParameters $WebParams -Referer $Referer } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.schema.mof index 918aac19..be3e6e3b 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Portal_TLS/ArcGIS_Portal_TLS.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Portal_TLS")] class ArcGIS_Portal_TLS : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.psm1 index 73004c5b..eb89940d 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the download a file from remote file storage server. .PARAMETER Url diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.schema.mof index d3d4e4b8..8a6a50bc 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_RemoteFile/ArcGIS_RemoteFile.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_RemoteFile")] class ArcGIS_RemoteFile : OMI_BaseResource { @@ -8,4 +8,4 @@ class ArcGIS_RemoteFile : OMI_BaseResource [Write, EmbeddedInstance("MSFT_Credential")] String AFSCredential; [Write] String AFSEndpoint; [Write, ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.psm1 index 6d24f615..bf4495a8 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.psm1 @@ -1,4 +1,4 @@ -function Add-RewriteRule +function Add-RewriteRule { [CmdletBinding()] param( diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.schema.mof index 941b8212..4c17fd9d 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ReverseProxy_ARR/ArcGIS_ReverseProxy_ARR.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_ReverseProxy_ARR")] class ArcGIS_ReverseProxy_ARR : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.psm1 index c608249b..e0686bf7 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Server to create a New Server Site or Join it to an existing Server Site .PARAMETER ServerHostName @@ -1088,4 +1088,4 @@ function Set-TokenSettings { $Response } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.schema.mof index 554ec37c..0821193a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server/ArcGIS_Server.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("")] class ArcGIS_Server : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server/FQDN.class b/Modules/ArcGIS/DSCResources/ArcGIS_Server/FQDN.class index d03e4c7a..19de244e 100644 Binary files a/Modules/ArcGIS/DSCResources/ArcGIS_Server/FQDN.class and b/Modules/ArcGIS/DSCResources/ArcGIS_Server/FQDN.class differ diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.psm1 index cf0f1436..05f5567e 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -318,4 +318,4 @@ function Register-WebAdaptorForServer Invoke-ArcGISWebRequest -Url $RegisterWebAdaptorsUrl -HttpFormParameters $WebParams -Referer $Referer } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.schema.mof index f94a51f6..814dd1c9 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ServerSettings/ArcGIS_ServerSettings.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_ServerSettings")] class ArcGIS_ServerSettings : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.psm1 index 298ee924..b1ba9283 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to aid post upgrade completion workflows. This resource upgrades the Server Site once Server Installer has completed the upgrade. .PARAMETER Ensure @@ -114,36 +114,10 @@ function Set-TargetResource while(-not($ServerReady) -and ($Attempts -lt 120)){ $ResponseStatus = Invoke-ArcGISWebRequest -Url $ServerUpgradeUrl -HttpFormParameters @{f = 'json'} -Referer $Referer -Verbose -HttpMethod 'GET' if(($ResponseStatus.upgradeStatus -ne 'IN_PROGRESS') -and ($ResponseStatus.code -ieq '404') -and ($ResponseStatus.status -ieq 'error')){ - Write-Verbose "Server Upgrade is likely done!" - $Info = Invoke-ArcGISWebRequest -Url ($ServerSiteURL.TrimEnd('/') + "/arcgis/rest/info") -HttpFormParameters @{f = 'json';} -Referer $Referer -Verbose - $currentversion = "$($Info.currentVersion)" - Write-Verbose "Current Version Installed - $currentversion" - if($currentversion -ieq "10.51"){ - $currentversion = "10.5.1" - }elseif($currentversion -ieq "10.61"){ - $currentversion = "10.6.1" - }elseif($currentversion -ieq "10.71"){ - $currentversion = "10.7.1" - }elseif($currentversion -ieq "10.81"){ - $currentversion = "10.8.1" - }elseif($currentversion -ieq "10.91"){ - $currentversion = "10.9.1" + if(Test-ServerUpgradeStatus -ServerSiteURL $ServerSiteURL -Referer $Referer -Version $Version -Verbose){ + $ServerReady = $True + break } - - if(($Version.Split('.').Length -gt 1) -and ($Version.Split('.')[1] -eq $currentversion.Split('.')[1])){ - if($Version.Split('.').Length -eq 3){ - if($Version.Split('.')[2] -eq $currentversion.Split('.')[2]){ - Write-Verbose 'Server Upgrade Successful' - $ServerReady = $true - break - } - }else{ - Write-Verbose 'Server Upgrade Successful' - $ServerReady = $true - break - } - } - }elseif(($ResponseStatus.status -ieq "error") -and ($ResponseStatus.code -ieq '500')){ throw $ResponseStatus.messages break @@ -191,20 +165,28 @@ function Test-TargetResource $result = Test-Install -Name "Server" -Version $Version $FQDN = if($ServerHostName){ Get-FQDN $ServerHostName }else{ Get-FQDN $env:COMPUTERNAME } $Referer = "http://localhost" - $ServerUpgradeUrl = "https://$($FQDN):6443/arcgis/admin/upgrade" + + Wait-ForUrl -Url "https://$($FQDN):6443/arcgis/admin" -MaxWaitTimeInSeconds 300 -SleepTimeInSeconds 15 -HttpMethod 'GET' -Verbose + + $Referer = "http://localhost" + $ServerSiteURL = "https://$($FQDN):6443" + $ServerUpgradeUrl = "$($ServerSiteURL)/arcgis/admin/upgrade" $ResponseStatus = Invoke-ArcGISWebRequest -Url $ServerUpgradeUrl -HttpFormParameters @{f = 'json'} -Referer $Referer -Verbose -HttpMethod 'GET' - if($result) { if($ResponseStatus.upgradeStatus -ieq "UPGRADE_REQUIRED" -or $ResponseStatus.upgradeStatus -ieq "LAST_ATTEMPT_FAILED" -or $ResponseStatus.upgradeStatus -ieq "IN_PROGRESS"){ $result = $false }else{ - $result = $true + if(($ResponseStatus.code -ieq '404') -and ($ResponseStatus.status -ieq 'error')){ + $result = Test-ServerUpgradeStatus -ServerSiteURL $ServerSiteURL -Referer $Referer -Version $Version -Verbose + } else { + Write-Verbose "Error Code - $($ResponseStatus.code), Error Messages - $($ResponseStatus.messages)" + $result = $false + } } }else{ throw "ArcGIS Server not upgraded to required Version" } - if($Ensure -ieq 'Present') { $result } @@ -213,4 +195,54 @@ function Test-TargetResource } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +function Test-ServerUpgradeStatus +{ + [CmdletBinding()] + [OutputType([System.Boolean])] + param + ( + [parameter(Mandatory = $true)] + [System.String] + $ServerSiteURL, + + [parameter(Mandatory = $true)] + [System.String] + $Referer, + + [parameter(Mandatory = $true)] + [System.String] + $Version + + ) + + Write-Verbose "Server Upgrade is likely done!" + $Info = Invoke-ArcGISWebRequest -Url ($ServerSiteURL.TrimEnd('/') + "/arcgis/rest/info") -HttpFormParameters @{f = 'json';} -Referer $Referer -Verbose + $currentversion = "$($Info.currentVersion)" + Write-Verbose "Current Version Installed - $currentversion" + if($currentversion -ieq "10.51"){ + $currentversion = "10.5.1" + }elseif($currentversion -ieq "10.61"){ + $currentversion = "10.6.1" + }elseif($currentversion -ieq "10.71"){ + $currentversion = "10.7.1" + }elseif($currentversion -ieq "10.81"){ + $currentversion = "10.8.1" + }elseif($currentversion -ieq "10.91"){ + $currentversion = "10.9.1" + } + + if(($Version.Split('.').Length -gt 1) -and ($Version.Split('.')[1] -eq $currentversion.Split('.')[1])){ + if($Version.Split('.').Length -eq 3){ + if($Version.Split('.')[2] -eq $currentversion.Split('.')[2]){ + Write-Verbose 'Server Upgrade Successful' + return $True + } + }else{ + Write-Verbose 'Server Upgrade Successful' + return $True + } + } + return $False +} + +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.schema.mof index f24131af..535e73a5 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/ArcGIS_ServerUpgrade.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_ServerUpgrade")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_ServerUpgrade")] class ArcGIS_ServerUpgrade : OMI_BaseResource { [Key] String ServerHostName; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/FQDN.class b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/FQDN.class index d03e4c7a..19de244e 100644 Binary files a/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/FQDN.class and b/Modules/ArcGIS/DSCResources/ArcGIS_ServerUpgrade/FQDN.class differ diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.psm1 index 58e9064a..f59468a0 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Makes a request to the installed Server to Register Existing External Cache Directories with existing Server Site .PARAMETER ServerHostName @@ -223,4 +223,4 @@ function Set-RegisteredDirectory } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.schema.mof index 44f80580..ba8780df 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_RegisterDirectories/ArcGIS_Server_RegisterDirectories.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Server_RegisterDirectories")] class ArcGIS_Server_RegisterDirectories : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.psm1 index 3f246bb8..16fc24bf 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -872,4 +872,4 @@ function Update-ServiceProperties } } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.schema.mof index f789efc0..78f8bfe8 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_Service/ArcGIS_Server_Service.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Server_Service")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Server_Service")] class ArcGIS_Server_Service : OMI_BaseResource { [Key] String ServerHostName; @@ -15,4 +15,4 @@ class ArcGIS_Server_Service : OMI_BaseResource [Write] String PortalHostName; [Write] uint32 PortalPort; [Write] String PortalContext; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.psm1 index 9b67ef7e..36224827 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Creates a SelfSigned Certificate or Installs a SSL Certificated Provided and Configures it with Server .PARAMETER ServerHostName diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.schema.mof index a9c1df58..1fa9f195 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Server_TLS/ArcGIS_Server_TLS.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Server_TLS")] class ArcGIS_Server_TLS : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.psm1 index 2b8bfa67..d5b217e7 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to make the Data Directories accesssible to given Run as Account for a given ArcGIS Component. .PARAMETER Ensure @@ -1033,4 +1033,4 @@ CannotSetAccountAccessErrorMessage=Failed to set user policy rights "@ } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.schema.mof index 375bcca0..a3111817 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_Service_Account/ArcGIS_Service_Account.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_Service_Account")] class ArcGIS_Service_Account : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.psm1 index 9d21cdf6..bfc7b2d1 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.psm1 @@ -1,4 +1,4 @@ - + <# .SYNOPSIS Imports a SSL certificate to specified store location on local machines. diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.schema.mof index a050ce66..fdd64277 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateFileImport/ArcGIS_TLSCertificateFileImport.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_TLSCertificateFileImport")] class ArcGIS_TLSCertificateFileImport: OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.psm1 index 8f1e4c07..bf45b833 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Imports a SSL certificate from remote machine to local machines root store. .PARAMETER Ensure diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.schema.mof index 47331417..6f45a114 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_TLSCertificateImport/ArcGIS_TLSCertificateImport.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_TLSCertificateImport")] class ArcGIS_TLSCertificateImport : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.psm1 index 75cd5100..96eb4d2b 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource Implements application level to handle cross node dependencies specific to the ArcGIS Enterprise Stack .PARAMETER Component @@ -350,4 +350,4 @@ function Test-DataStoreRegistered $result } -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.schema.mof index dc7afc4c..b853d449 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WaitForComponent/ArcGIS_WaitForComponent.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_WaitForComponent")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_WaitForComponent")] class ArcGIS_WaitForComponent : OMI_BaseResource { [Key, ValueMap{"Server","NotebookServer","MissionServer","Portal","ServerWA","PortalWA","DataStore","SpatioTemporal","TileCache","UnregisterPortal"}, Values{"Server","NotebookServer","MissionServer","Portal","ServerWA","PortalWA","DataStore","SpatioTemporal","TileCache","UnregisterPortal"}] String Component; @@ -9,4 +9,4 @@ class ArcGIS_WaitForComponent : OMI_BaseResource [Write, EmbeddedInstance("MSFT_Credential")] String Credential; [Write,Description("Interval in seconds for retries.")] Uint32 RetryIntervalSec; [Write,Description("Number of times to retry.")] Uint32 RetryCount; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.psm1 index 775145ed..2201353b 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Configures a WebAdaptor .PARAMETER Ensure diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.schema.mof index 3b6decf6..5d3b3c6d 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WebAdaptor/ArcGIS_WebAdaptor.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_WebAdaptor")] class ArcGIS_WebAdaptor : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.psm1 index e50d203c..ae01e245 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.psm1 @@ -1,4 +1,4 @@ -<# +<# .SYNOPSIS Resource to start or stop a Windows Service. .PARAMETER Name diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.schema.mof index 5cb24ed9..022d757a 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_WindowsService/ArcGIS_WindowsService.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0"),FriendlyName("ArcGIS_WindowsService")] class ArcGIS_WindowsService : OMI_BaseResource { @@ -11,4 +11,4 @@ class ArcGIS_WindowsService : OMI_BaseResource [Read, Description("The service description")] string Description; [Read, Description("The path to the service executable file")] string Path; [Read, Description("A list of service dependencies")] string Dependencies[]; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.psm1 index 212733c5..72c0c088 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.psm1 @@ -1,4 +1,4 @@ -# +# # xComputer: DSC resource to initialize, partition, and format disks. # diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.schema.mof index b450935d..eae9a573 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xDisk/ArcGIS_xDisk.schema.mof @@ -1,7 +1,7 @@ - + [ClassVersion("0.1.0.0"), FriendlyName("ArcGIS_xDisk")] class ArcGIS_xDisk : OMI_BaseResource { [key] uint32 DiskNumber; [write] string DriveLetter; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.Schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.Schema.mof index a290e376..4af262ba 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.Schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.Schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0"), FriendlyName("ArcGIS_xFirewall")] +[ClassVersion("1.0.0"), FriendlyName("ArcGIS_xFirewall")] class ArcGIS_xFirewall : OMI_BaseResource { [Key, Description("Name of the Firewall Rule")] String Name; @@ -15,4 +15,4 @@ class ArcGIS_xFirewall : OMI_BaseResource [Write, Description("Documentation for the Rule")] String Description; [Write, Description("Path and file name of the program for which the rule is applied")] String ApplicationPath; [Write, Description("Specifies the short name of a Windows service to which the firewall rule applies")] String Service; -}; \ No newline at end of file +}; diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.psm1 index ae9c12b5..ffbc4772 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xFirewall/ArcGIS_xFirewall.psm1 @@ -1,4 +1,4 @@ -# Default Display Group for the Firewall cmdlets +# Default Display Group for the Firewall cmdlets $DefaultDisplayGroup = "DSC_FirewallRule" # DSC uses the Get-TargetResource cmdlet to fetch the status of the resource instance specified in the parameters for the target machine @@ -663,4 +663,4 @@ function Get-FirewallRuleProperty #endregion -Export-ModuleMember -Function *-TargetResource \ No newline at end of file +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.psm1 index 48f05ea5..e9503739 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.psm1 @@ -1,4 +1,4 @@ -function Get-TargetResource +function Get-TargetResource { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.schema.mof index 25e6ca61..fd2e8ac1 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xSmbShare/ArcGIS_xSmbShare.schema.mof @@ -1,4 +1,4 @@ - + [ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_xSmbShare")] class ArcGIS_xSmbShare : OMI_BaseResource { diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.psm1 index 9b5ed8df..0b66eec3 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.psm1 +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.psm1 @@ -1,4 +1,4 @@ -Data LocalizedData +Data LocalizedData { # culture="en-US"e ConvertFrom-StringData @' diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.schema.mof b/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.schema.mof index 83fb04ae..0c192a81 100644 --- a/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.schema.mof +++ b/Modules/ArcGIS/DSCResources/ArcGIS_xWindowsUpdate/ArcGIS_xWindowsUpdate.schema.mof @@ -1,4 +1,4 @@ -[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_xWindowsUpdate")] +[ClassVersion("1.0.0.0"), FriendlyName("ArcGIS_xWindowsUpdate")] class ArcGIS_xWindowsUpdate : OMI_BaseResource { // We can have multiple versions of an update for a single ID, the indentifier is in the file, diff --git a/Modules/ArcGIS/License.txt b/Modules/ArcGIS/License.txt index b1a429ba..2230c380 100644 --- a/Modules/ArcGIS/License.txt +++ b/Modules/ArcGIS/License.txt @@ -1,4 +1,4 @@ - Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-DualMachine.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-DualMachine.json new file mode 100644 index 00000000..b52aeb5a --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-DualMachine.json @@ -0,0 +1,94 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "DataStore" + ] + }, + { + "NodeName": "[Machine Name 2]", + "Role": [ + "Server", + "Portal", + "FileShare" + ] + }, + { + "NodeName": "[Machine Name 3]", + "Role": [ + "Server", + "Portal", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "FileShareLocalPath": "[File Share Local Path]", + "FileShareName": "[File Share Name]", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\directories", + "ConfigStoreLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation": "\\\\[File Share Machine 1]\\[File Share Name]\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-MultiMachine.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-MultiMachine.json new file mode 100644 index 00000000..4b6e26c5 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-MultiMachine.json @@ -0,0 +1,125 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "Role": [ + "FileShare" + ] + }, + { + "NodeName": "[Machine 2 Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "DataStore" + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + }, + { + "NodeName": "[Machine 4 Name]", + "Role": [ + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + }, + { + "NodeName": "[Machine 5 Name]", + "Role": [ + "Portal" + ] + }, + { + "NodeName": "[Machine 6 Name]", + "Role": [ + "Portal" + ] + }, + { + "NodeName": "[Machine 7 Name]", + "Role": [ + "Server" + ] + }, + { + "NodeName": "[Machine 8 Name]", + "Role": [ + "Server" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "FileShareLocalPath": "[File Share Local Path]", + "FileShareName": "[File Share Name]", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\directories", + "ConfigStoreLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\config-store", + "ExternalLoadBalancer": "", + "InternalLoadBalancer": "", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation": "\\\\[File Share Machine 1]\\[File Share Name]\\arcgisportal\\content", + "ExternalLoadBalancer": "", + "InternalLoadBalancer": "", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-CloudStore.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-CloudStore.json new file mode 100644 index 00000000..9447a16f --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-CloudStore.json @@ -0,0 +1,214 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "Server", + "Portal", + "DataStore", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "Password": "[ServiceAccount Password]", + "IsDomainAccount": false, + "IsMSAAccount": false + }, + "ADServiceUser": { + "UserName": "[ADServiceUser Username - Active Directory Service user for enabling use of Integrated Windows Authentication with your portal.]", + "Password": "[ADServiceUser Password]" + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "LocalRepositoryPath": "C:\\arcgisserver\\local", + "ServerLogsLocation": "C:\\arcgisserver\\logs", + "ServerDirectories": [ + { + "name": "arcgiscache", + "physicalPath": "C:\\arcgisserver\\directories\\arcgiscache", + "directoryType": "CACHE", + "cleanupMode": "NONE", + "maxFileAge": 0 + }, + { + "name": "arcgisjobs", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisjobs", + "directoryType": "JOBS", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 360 + }, + { + "name": "arcgisoutput", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisoutput", + "directoryType": "OUTPUT", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 10 + }, + { + "name": "arcgissystem", + "physicalPath": "C:\\arcgisserver\\directories\\arcgissystem", + "directoryType": "SYSTEM", + "cleanupMode": "NONE", + "maxFileAge": 0 + } + ], + "RegisteredDirectories": [ + { + "name": "BasemapsCacheDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\cache", + "directoryType": "CACHE" + }, + { + "name": "TestOutputDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testOutput", + "directoryType": "OUTPUT" + }, + { + "name": "TestJobsDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testJobs", + "directoryType": "JOBS" + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + }, + "ConfigStoreCloudStorageAccount":{ + "UserName": "[CloudStorageAccount Account Name/ Access Id]", + "Password": "[CloudStorageAccount SAS Token/Secret Key/Password ]", + "CloudStorageType": "[Required - 'AzureBlob','AzureFiles','AWSS3DynamoDB']", + "AzureFileShareName": "[Required if CloudStorageType is 'AzureFiles']", + "CloudNamespace": "[Required if using cloud storage - Unique identifiable string for your deployment to avoid conflicts.The namespace used for the S3 bucket/Azure Blob Storage Container must be unique for this ArcGIS Server site. ArcGIS appends the text arcgis-config-store- to the name you provide]", + "AWSRegion": "[Required if CloudStorageType is 'AWSS3DynamoDB']" + }, + "ServerDirectoriesCloudStorageAccount":{ + "UserName": "[CloudStorageAccount Account Name/ Access Id]", + "Password": "[CloudStorageAccount SAS Token/Secret Key/Password ]", + "CloudStorageType": "AzureFiles", + "AzureFileShareName": "[Required if CloudStorageType is 'AzureFiles']", + "CloudNamespace": "[Required id using cloud storage - Unique identifiable string for your deployment to avoid conflicts]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal", + "PatchesDir": "[Path to Directory with Patches for Portal]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "EnableAutomaticAccountCreation": true, + "DefaultRoleForUser": "[Optional - Values: account_user | account_publisher | ]", + "DefaultUserLicenseTypeIdForUser": "[Optional (Valid for 10.7 and later) - Values: fieldWorkerUT | GISProfessionalStdUT | GISProfessionalBasicUT | GISProfessionalAdvUT | creatorUT | editorUT | viewerUT]", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + }, + "PortalContentCloudStorageAccount":{ + "UserName": "[CloudStorageAccount Account Name/ Access Id]", + "Password": "[CloudStorageAccount SAS Token/Secret Key/Password ]", + "CloudStorageType": "[Required - 'AzureBlob','AzureFiles','AWSS3DynamoDB']", + "AzureFileShareName": "[Required if CloudStorageType is 'AzureFiles']", + "CloudNamespace": "[Required if using cloud storage - Unique identifiable string for your deployment to avoid conflicts. The namespace used for the Azure Blob Storage Container must be unique for this ArcGIS portal site. For Azure, Powershell DSC Module will prepend the text arcgis-portal-content- to the name you provide. For AWS, this variable corresponds to Bucket Name which should have been created before running this module]", + "AWSRegion": "[Required if CloudStorageType is 'AWSS3DynamoDB']" + + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]", + "PatchesDir": "[Path to Directory with Patches for DataStore]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "Backups":{ + "Relational":[{ + "Name": "[Required - Backup Name]", + "Type": "[Required - fs / s3 /Azure]", + "Location": "[Required - fs - fileshare location / s3 - Bucket Name / Azure - Container Name ]", + "ForceBackupLocationUpdate": false, + "IsDefault": false, + "CloudStorageAccount":{ + "UserName": "[s3 - AWS Access Id / Azure - Cloud Storage Account Account Name/ ]", + "Password": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "PasswordFile": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "ForceUpdate": false + } + }], + "TileCache":[{ + "Name": "[Required - Backup Name]", + "Type": "[Required - fs / s3 /Azure]", + "Location": "[Required - fs - fileshare location / s3 - Bucket Name / Azure -Container Name ]", + "IsDefault": false, + "CloudStorageAccount":{ + "UserName": "[s3 - AWS Access Id / Azure - Cloud Storage Account Account Name/ ]", + "Password": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "PasswordFile": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "ForceUpdate": false + } + }], + "SpatioTemporal":[{ + "Name": "[Required - Backup Name]", + "Type": "[Required - fs / s3 /Azure]", + "Location": "[ fs - fileshare location / s3 - Bucket Name / Azure -Container Name ]", + "IsDefault": false, + "CloudStorageAccount":{ + "UserName": "[s3 - AWS Access Id / Azure - Cloud Storage Account Account Name/ ]", + "Password": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "PasswordFile": "[s3 - AWS secret key / Azure - Cloud Storage Secret Key]", + "ForceUpdate": false + } + }] + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]", + "PatchesDir": "[Path to Directory with Patches for Web Adaptor]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-Insights.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-Insights.json new file mode 100644 index 00000000..897551b0 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-Insights.json @@ -0,0 +1,174 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "Server", + "Portal", + "DataStore", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "InsightsVersion": "[Version of ArcGIS Insights]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "Password": "[ServiceAccount Password]", + "IsDomainAccount": false, + "IsMSAAccount": false + }, + "ADServiceUser": { + "UserName": "[ADServiceUser Username - Active Directory Service user for enabling use of Integrated Windows Authentication with your portal.]", + "Password": "[ADServiceUser Password]" + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "LocalRepositoryPath": "C:\\arcgisserver\\local", + "ServerLogsLocation": "C:\\arcgisserver\\logs", + "ServerDirectories": [ + { + "name": "arcgiscache", + "physicalPath": "C:\\arcgisserver\\directories\\arcgiscache", + "directoryType": "CACHE", + "cleanupMode": "NONE", + "maxFileAge": 0 + }, + { + "name": "arcgisjobs", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisjobs", + "directoryType": "JOBS", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 360 + }, + { + "name": "arcgisoutput", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisoutput", + "directoryType": "OUTPUT", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 10 + }, + { + "name": "arcgissystem", + "physicalPath": "C:\\arcgisserver\\directories\\arcgissystem", + "directoryType": "SYSTEM", + "cleanupMode": "NONE", + "maxFileAge": 0 + } + ], + "RegisteredDirectories": [ + { + "name": "BasemapsCacheDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\cache", + "directoryType": "CACHE" + }, + { + "name": "TestOutputDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testOutput", + "directoryType": "OUTPUT" + }, + { + "name": "TestJobsDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testJobs", + "directoryType": "JOBS" + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal", + "PatchesDir": "[Path to Directory with Patches for Portal]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "EnableAutomaticAccountCreation": true, + "DefaultRoleForUser": "[Optional - Values: account_user | account_publisher | ]", + "DefaultUserLicenseTypeIdForUser": "[Optional (Valid for 10.7 and later) - Values: fieldWorkerUT | GISProfessionalStdUT | GISProfessionalBasicUT | GISProfessionalAdvUT | creatorUT | editorUT | viewerUT]", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + }, + "EmailSettings":{ + "SMTPServerAddress":"[SMTP Server Host Address]", + "From":"[SMTP Server Host Email From]", + "Label":"[SMTP Server Host Email From Label]", + "AuthenticationRequired":"[SMTP Server Host Authentication required flag - False | True]", + "SMTPPort":"[SMTP Server Host Port]", + "UserName": "[SMTP Server Host Authentication Username]", + "Password": "[SMTP Server Host Authentication Password]", + "PasswordFilePath": "[SMTP Server Host Authentication Password File Path]", + "EncryptionMethod": "[SMTP Server Host Encryption Method - SSL,TLS,NONE]" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "EnablePointInTimeRecovery": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]", + "PatchesDir": "[Path to Directory with Patches for DataStore]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]", + "PatchesDir": "[Path to Directory with Patches for Web Adaptor]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "WebSiteId": 1 + }, + "Insights": { + "Installer": { + "Path": "[Insights Installer Path]", + "PatchesDir": "[Path to Directory with Patches for Insights]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-MultipleServerRoles.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-MultipleServerRoles.json new file mode 100644 index 00000000..2e86c799 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-MultipleServerRoles.json @@ -0,0 +1,188 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "Server", + "Portal", + "DataStore", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "AdditionalServerRoles":[ + "Geoevent", + "RasterAnalytics", + "WorkflowManagerServer", + "GeoAnalytics", + "ImageHosting" + ], + "Credentials": { + "ServiceAccount": { + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "Password": "[ServiceAccount Password]", + "IsDomainAccount": false, + "IsMSAAccount": false + }, + "ADServiceUser": { + "UserName": "[ADServiceUser Username - Active Directory Service user for enabling use of Integrated Windows Authentication with your portal.]", + "Password": "[ADServiceUser Password]" + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "LocalRepositoryPath": "C:\\arcgisserver\\local", + "ServerLogsLocation": "C:\\arcgisserver\\logs", + "ServerDirectories": [ + { + "name": "arcgiscache", + "physicalPath": "C:\\arcgisserver\\directories\\arcgiscache", + "directoryType": "CACHE", + "cleanupMode": "NONE", + "maxFileAge": 0 + }, + { + "name": "arcgisjobs", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisjobs", + "directoryType": "JOBS", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 360 + }, + { + "name": "arcgisoutput", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisoutput", + "directoryType": "OUTPUT", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 10 + }, + { + "name": "arcgissystem", + "physicalPath": "C:\\arcgisserver\\directories\\arcgissystem", + "directoryType": "SYSTEM", + "cleanupMode": "NONE", + "maxFileAge": 0 + } + ], + "RegisteredDirectories": [ + { + "name": "BasemapsCacheDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\cache", + "directoryType": "CACHE" + }, + { + "name": "TestOutputDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testOutput", + "directoryType": "OUTPUT" + }, + { + "name": "TestJobsDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testJobs", + "directoryType": "JOBS" + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WorkflowManagerServer": { + "LicenseFilePath": "[License File Path - Workflow Manager Server ]", + "Installer": { + "Path": "[Workflow Manager Server Installer Path]" + } + }, + "GeoEventServer": { + "LicenseFilePath": "[License File Path - GeoEvent Server ]", + "Installer": { + "Path": "[GeoEvent Server Installer Path]", + "PatchesDir": "[Path to Directory with Patches for GeoEvent Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "EnableGeoeventSDK": "[ Optional - True | False(Default) - Enables GeoEvent SDK during installation.]" + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal", + "PatchesDir": "[Path to Directory with Patches for Portal]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "EnableAutomaticAccountCreation": true, + "DefaultRoleForUser": "[Optional - Values: account_user | account_publisher | ]", + "DefaultUserLicenseTypeIdForUser": "[Optional (Valid for 10.7 and later) - Values: fieldWorkerUT | GISProfessionalStdUT | GISProfessionalBasicUT | GISProfessionalAdvUT | creatorUT | editorUT | viewerUT]", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + }, + "EmailSettings":{ + "SMTPServerAddress":"[SMTP Server Host Address]", + "From":"[SMTP Server Host Email From]", + "Label":"[SMTP Server Host Email From Label]", + "AuthenticationRequired":"[SMTP Server Host Authentication required flag - False | True]", + "SMTPPort":"[SMTP Server Host Port]", + "UserName": "[SMTP Server Host Authentication Username]", + "Password": "[SMTP Server Host Authentication Password]", + "PasswordFilePath": "[SMTP Server Host Authentication Password File Path]", + "EncryptionMethod": "[SMTP Server Host Encryption Method - SSL,TLS,NONE]" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "EnablePointInTimeRecovery": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]", + "PatchesDir": "[Path to Directory with Patches for DataStore]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]", + "PatchesDir": "[Path to Directory with Patches for Web Adaptor]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "WebSiteId": 1 + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-WorkflowManagerWebapp-10.8.1-10.9.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-WorkflowManagerWebapp-10.8.1-10.9.json new file mode 100644 index 00000000..a1fa6c20 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine-WorkflowManagerWebapp-10.8.1-10.9.json @@ -0,0 +1,165 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "Server", + "Portal", + "DataStore", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment - 10.8.1 or 10.9]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "Password": "[ServiceAccount Password]", + "IsDomainAccount": false, + "IsMSAAccount": false + }, + "ADServiceUser": { + "UserName": "[ADServiceUser Username - Active Directory Service user for enabling use of Integrated Windows Authentication with your portal.]", + "Password": "[ADServiceUser Password]" + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "LocalRepositoryPath": "C:\\arcgisserver\\local", + "ServerLogsLocation": "C:\\arcgisserver\\logs", + "ServerDirectories": [ + { + "name": "arcgiscache", + "physicalPath": "C:\\arcgisserver\\directories\\arcgiscache", + "directoryType": "CACHE", + "cleanupMode": "NONE", + "maxFileAge": 0 + }, + { + "name": "arcgisjobs", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisjobs", + "directoryType": "JOBS", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 360 + }, + { + "name": "arcgisoutput", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisoutput", + "directoryType": "OUTPUT", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 10 + }, + { + "name": "arcgissystem", + "physicalPath": "C:\\arcgisserver\\directories\\arcgissystem", + "directoryType": "SYSTEM", + "cleanupMode": "NONE", + "maxFileAge": 0 + } + ], + "RegisteredDirectories": [ + { + "name": "BasemapsCacheDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\cache", + "directoryType": "CACHE" + }, + { + "name": "TestOutputDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testOutput", + "directoryType": "OUTPUT" + }, + { + "name": "TestJobsDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testJobs", + "directoryType": "JOBS" + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal", + "PatchesDir": "[Path to Directory with Patches for Portal]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "EnableAutomaticAccountCreation": true, + "DefaultRoleForUser": "[Optional - Values: account_user | account_publisher | ]", + "DefaultUserLicenseTypeIdForUser": "[Optional (Valid for 10.7 and later) - Values: fieldWorkerUT | GISProfessionalStdUT | GISProfessionalBasicUT | GISProfessionalAdvUT | creatorUT | editorUT | viewerUT]", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + }, + "EmailSettings":{ + "SMTPServerAddress":"[SMTP Server Host Address]", + "From":"[SMTP Server Host Email From]", + "Label":"[SMTP Server Host Email From Label]", + "AuthenticationRequired":"[SMTP Server Host Authentication required flag - False | True]", + "SMTPPort":"[SMTP Server Host Port]", + "UserName": "[SMTP Server Host Authentication Username]", + "Password": "[SMTP Server Host Authentication Password]", + "PasswordFilePath": "[SMTP Server Host Authentication Password File Path]", + "EncryptionMethod": "[SMTP Server Host Encryption Method - SSL,TLS,NONE]" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "EnablePointInTimeRecovery": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]", + "PatchesDir": "[Path to Directory with Patches for DataStore]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + }, + "WebSiteId": 1 + }, + "WorkflowManagerWebApp": { + "Installer": { + "Path": "[Workflow Manager Web App Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine.json new file mode 100644 index 00000000..a488edf7 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-SingleMachine.json @@ -0,0 +1,164 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "DataStoreTypes": [ + "Relational" + ], + "Role": [ + "Server", + "Portal", + "DataStore", + "ServerWebAdaptor", + "PortalWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "Password": "[ServiceAccount Password]", + "IsDomainAccount": false, + "IsMSAAccount": false + }, + "ADServiceUser": { + "UserName": "[ADServiceUser Username - Active Directory Service user for enabling use of Integrated Windows Authentication with your portal.]", + "Password": "[ADServiceUser Password]" + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "LocalRepositoryPath": "C:\\arcgisserver\\local", + "ServerLogsLocation": "C:\\arcgisserver\\logs", + "ServerDirectories": [ + { + "name": "arcgiscache", + "physicalPath": "C:\\arcgisserver\\directories\\arcgiscache", + "directoryType": "CACHE", + "cleanupMode": "NONE", + "maxFileAge": 0 + }, + { + "name": "arcgisjobs", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisjobs", + "directoryType": "JOBS", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 360 + }, + { + "name": "arcgisoutput", + "physicalPath": "C:\\arcgisserver\\directories\\arcgisoutput", + "directoryType": "OUTPUT", + "cleanupMode": "TIME_ELAPSED_SINCE_LAST_MODIFIED", + "maxFileAge": 10 + }, + { + "name": "arcgissystem", + "physicalPath": "C:\\arcgisserver\\directories\\arcgissystem", + "directoryType": "SYSTEM", + "cleanupMode": "NONE", + "maxFileAge": 0 + } + ], + "RegisteredDirectories": [ + { + "name": "BasemapsCacheDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\cache", + "directoryType": "CACHE" + }, + { + "name": "TestOutputDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testOutput", + "directoryType": "OUTPUT" + }, + { + "name": "TestJobsDir", + "physicalPath": "C:\\arcgisserver\\additionaldirs\\testJobs", + "directoryType": "JOBS" + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal", + "PatchesDir": "[Path to Directory with Patches for Portal]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "EnableAutomaticAccountCreation": true, + "DefaultRoleForUser": "[Optional - Values: account_user | account_publisher | ]", + "DefaultUserLicenseTypeIdForUser": "[Optional (Valid for 10.7 and later) - Values: fieldWorkerUT | GISProfessionalStdUT | GISProfessionalBasicUT | GISProfessionalAdvUT | creatorUT | editorUT | viewerUT]", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + }, + "EmailSettings":{ + "SMTPServerAddress":"[SMTP Server Host Address]", + "From":"[SMTP Server Host Email From]", + "Label":"[SMTP Server Host Email From Label]", + "AuthenticationRequired":"[SMTP Server Host Authentication required flag - False | True]", + "SMTPPort":"[SMTP Server Host Port]", + "UserName": "[SMTP Server Host Authentication Username]", + "Password": "[SMTP Server Host Authentication Password]", + "PasswordFilePath": "[SMTP Server Host Authentication Password File Path]", + "EncryptionMethod": "[SMTP Server Host Encryption Method - SSL,TLS,NONE]" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "EnablePointInTimeRecovery": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]", + "PatchesDir": "[Path to Directory with Patches for DataStore]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]", + "PatchesDir": "[Path to Directory with Patches for Web Adaptor]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "WebSiteId": 1 + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-per-node-licenses.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-per-node-licenses.json new file mode 100644 index 00000000..1e1ee416 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-per-node-licenses.json @@ -0,0 +1,96 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "DataStoreTypes": [ + "Relational", + "SpatioTemporal" + ], + "Role": [ + "DataStore" + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "Portal", + "PortalWebAdaptor" + ], + "PortalLicenseFilePath": "[OPTIONAL - Valid Parameter for 10.6.1 and below]", + "PortalLicensePassword": "[OPTIONAL - Valid Parameter for 10.6.1 and below]" + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ], + "ServerLicenseFilePath": "[OPTIONAL]", + "ServerLicensePassword": "[OPTIONAL]" + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server - Will be over ridden by Node Level Licence File ]", + "LicensePassword": "[License Password - Server - OPTIONAL] - Will be over ridden by Node Level Password", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal - Will be over ridden by Node Level Licence File]", + "LicensePassword": "[License Password - Portal - OPTIONAL - Will be over ridden by Node Level Password - Valid Parameter for 10.6.1 and below]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example1.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example1.json new file mode 100644 index 00000000..9fafd44f --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example1.json @@ -0,0 +1,139 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "DataStoreTypes": [ + "Relational", + "SpatioTemporal" + ], + "Role": [ + "DataStore" + ], + "SslCertificates": [ + { + "Path": "[DataStore SSL Certificate Path]", + "Password": "[DataStore SSL Password]", + "CNameFQDN": "[DataStore CName Alias]", + "Target": [ + "DataStore" + ] + } + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ], + "SslCertificates": [ + { + "Path": "[Server SSL Certificate Path]", + "Password": "[Server SSL Password]", + "CNameFQDN": "[Server CName Alias]", + "Target": [ + "Server" + ] + }, + { + "Path": "[Server WebAdaptor SSL Certificate Path]", + "Password": "[Server WebAdaptor SSL Password]", + "CNameFQDN": "[Server WebAdaptor CName Alias]", + "Target": [ + "WebAdaptor" + ] + } + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Portal", + "PortalWebAdaptor" + ], + "SslCertificates": [ + { + "Path": "[Common Cert for Portal and Portal Webadaptor SSL Certificate Path]", + "Password": "[Common Cert SSL Password]", + "CNameFQDN": "[Common Cert CName Alias]", + "Target": [ + "Portal", + "WebAdaptor" + ] + } + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "SslRootOrIntermediate": [ + { + "Alias": "[ROOT-CA Alias]", + "Path": "[ROOT-CA SSL Certificate Path]" + }, + { + "Alias": "[Intermediate-CA Alias]", + "Path": "[Intermediate-CA SSL Certificate Path]" + } + ], + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example2.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example2.json new file mode 100644 index 00000000..d9b9ba2f --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example2.json @@ -0,0 +1,138 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "DataStoreTypes": [ + "Relational", + "SpatioTemporal" + ], + "Role": [ + "DataStore", + "Server" + ], + "SslCertificates": [ + { + "Path": "[Server SSL Certificate Path]", + "Password": "[Server SSL Password]", + "CNameFQDN": "[Server CName Alias]", + "Target": [ + "Server" + ] + }, + { + "Path": "[DataStore SSL Certificate Path]", + "Password": "[DataStore SSL Password]", + "CNameFQDN": "[DataStore CName Alias]", + "Target": [ + "DataStore" + ] + } + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "ServerWebAdaptor", + "PortalWebAdaptor" + ], + "SslCertificates": [ + { + "Path": "[WebAdaptor SSL Certificate Path]", + "Password": "[WebAdaptor SSL Password]", + "CNameFQDN": "[WebAdaptor CName Alias]", + "Target": [ + "WebAdaptor" + ] + } + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Portal" + ], + "SslCertificates": [ + { + "Path": "[Portal SSL Certificate Path]", + "Password": "[Portal SSL Password]", + "CNameFQDN": "[Portal CName Alias]", + "Target": [ + "Portal" + ] + } + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "SslRootOrIntermediate": [ + { + "Alias": "[ROOT-CA Alias]", + "Path": "[ROOT-CA SSL Certificate Path]" + }, + { + "Alias": "[Intermediate-CA Alias]", + "Path": "[Intermediate-CA SSL Certificate Path]" + } + ], + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example3.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example3.json new file mode 100644 index 00000000..7aba2912 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine-ssl-per-Node-Example3.json @@ -0,0 +1,158 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "DataStoreTypes": [ + "Relational", + "SpatioTemporal" + ], + "Role": [ + "DataStore", + "Server" + ], + "SslCertificates": [ + { + "Path": "[Server SSL Certificate Path]", + "Password": "[Server SSL Password]", + "CNameFQDN": "[Server CName Alias]", + "Target": [ + "Server" + ], + "SslRootOrIntermediate": [ + { + "Alias": "[ROOT-CA Alias]", + "Path": "[ROOT-CA SSL Certificate Path]" + }, + { + "Alias": "[Intermediate-CA Alias]", + "Path": "[Intermediate-CA SSL Certificate Path]" + } + ] + }, + { + "Path": "[DataStore SSL Certificate Path]", + "Password": "[DataStore SSL Password]", + "CNameFQDN": "[DataStore CName Alias]", + "Target": [ + "DataStore" + ] + } + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "ServerWebAdaptor", + "PortalWebAdaptor" + ], + "SslCertificates": [ + { + "Path": "[WebAdaptor SSL Certificate Path]", + "Password": "[WebAdaptor SSL Password]", + "CNameFQDN": "[WebAdaptor CName Alias]", + "Target": [ + "WebAdaptor" + ] + } + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Portal" + ], + "SslCertificates": [ + { + "Path": "[Portal SSL Certificate Path]", + "Password": "[Portal SSL Password]", + "CNameFQDN": "[Portal CName Alias]", + "Target": [ + "Portal" + ], + "SslRootOrIntermediate": [ + { + "Alias": "[ROOT-CA Alias]", + "Path": "[ROOT-CA SSL Certificate Path]" + }, + { + "Alias": "[Intermediate-CA Alias]", + "Path": "[Intermediate-CA SSL Certificate Path]" + } + ] + } + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "SslRootOrIntermediate": [ + { + "Alias": "[ROOT-CA Alias]", + "Path": "[ROOT-CA SSL Certificate Path]" + }, + { + "Alias": "[Intermediate-CA Alias]", + "Path": "[Intermediate-CA SSL Certificate Path]" + } + ], + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine.json b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine.json new file mode 100644 index 00000000..781f6766 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Base Deployment/BaseDeployment-ThreeMachine.json @@ -0,0 +1,90 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "DataStoreTypes": [ + "Relational", + "SpatioTemporal" + ], + "Role": [ + "DataStore" + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "Portal", + "PortalWebAdaptor" + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerContext": "server", + "PortalContext": "portal", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Portal": { + "LicenseFilePath": "[License File Path - Portal ]", + "PortalLicenseUserTypeId": "[Portal License User Type Id- Required for 10.7 and above]", + "Installer": { + "Path": "[Portal Installer Path]", + "WebStylesPath": "[Optional Parameter starting ArcGIS Enterprise 10.7.1 - Portal Web Styles Installer Path]", + "InstallDir": "[Portal Install Dir - Ex. C:\\ArcGIS\\Portal]", + "ContentDir": "[Portal Content Dir for Install- Ex. C:\\arcgisportal" + }, + "ContentDirectoryLocation":"C:\\arcgisportal\\content", + "PortalAdministrator": { + "UserName": "[PortalAdministrator Username]", + "Email": "[PortalAdministrator Email]", + "Password": "[PortalAdministrator Password]", + "SecurityQuestionIndex": 1, + "SecurityAnswer": "vanilla" + } + }, + "DataStore": { + "ContentDirectoryLocation": "[Content Dir DataStore - C:\\arcgisdatastore]", + "EnableFailoverOnPrimaryStop": false, + "Installer": { + "Path": "[DataStore Installer Path]", + "InstallDir": "[DataStore Install Dir - Ex. C:\\ArcGIS\\DataStore]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-Float.json b/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-Float.json new file mode 100644 index 00000000..cf8b9ae2 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-Float.json @@ -0,0 +1,52 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Desktop" + ] + }, + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Desktop" + ] + }, + { + "NodeName": "[Machine Name 2]", + "Role": [ + "LicenseManager" + ] + } + ], + "ConfigData": { + "DesktopVersion": "[Version of ArcGIS Dektop ]", + "LicenseManagerVersion": "[Version of ArcGIS License Manager ]", + "Desktop": { + "SeatPreference": "Float", + "InstallFeatures": "[ALL | ,,]", + "ModifyFlexdAcl": "[TRUE | FALSE (Default)]", + "BlockAddIns": "[0 (Default All Addins Allowed), 1 (Signed by CA), 2 (Esri Addins Only), 3 (Esri Addins Only from Admin Folder), 4 (No Addins Allowed)]", + "DesktopConfig": "[ true - if you supply ESRI_LICENSE_HOST, SOFTWARE_CLASS, and SEAT_PREFERENCE on the command line ]", + "EsriLicenseHost": "[ License Host - [Machine Name 3] or Can be an external License Manager Host]", + "SoftwareClass": "[Viewer | Editor | Professional]", + "EnableEUEI": "[ True (Default enables participation of Esri User Experience Improvement Program) | False ]", + "Installer": { + "Path": "[Desktop Installer Path]", + "InstallDir": "[Desktop Install Dir - Ex. C:\\ArcGIS\\Desktop]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "LicenseManager": { + "LicenseFilePath": "[License File Path (*.prvs) - License Manager ]", + "Installer": { + "Path": "[License Manager Installer Path]", + "InstallDir": "[License Manager Install Dir - Ex. C:\\ArcGIS\\LicenseManager]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-SingleUse.json b/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-SingleUse.json new file mode 100644 index 00000000..1336e7ba --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/Desktop-SingleUse.json @@ -0,0 +1,80 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Desktop" + ] + } + ], + "ConfigData": { + "DesktopVersion": "[Version of ArcGIS Dektop ]", + "Desktop": { + "LicenseFilePath": "[License File Path - Desktop ]", + "SeatPreference": "Fixed", + "InstallFeatures": "[ALL | ,,]", + "ModifyFlexdAcl": "[TRUE | FALSE (Default)]", + "DesktopConfig": true, + "EnableEUEI": "[ True (Default enables participation of Esri User Experience Improvement Program) | False ]", + "Installer": { + "Path": "[Desktop Installer Path]", + "InstallDir": "[Desktop Install Dir - Ex. C:\\ArcGIS\\Desktop]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "Extensions":{ + "DataInteroperability":{ + "Installer": { + "Path": "[Data Interoperability Installer Path]" + } + }, + "DataReviewer":{ + "Installer": { + "Path": "[Data Reviewer Installer Path]" + } + }, + "WorkflowManagerClassic":{ + "Installer": { + "Path": "[Workflow Manager Classic Installer Path]" + }, + "Features":[ + "Desktop", + "TAM", + "ALL" + ] + }, + "LocationReferencing":{ + "Installer": { + "Path": "[Location Referencing Installer Path]" + }, + "Features":[ + "PipelineReferencing", + "Roads" + ] + }, + "MappingChartingSolution":{ + "Installer": { + "Path": "[Mapping and Charting Solutions Installer Path]" + }, + "Features":[ + "EsriProductionMapping", + "TAM", + "AviationCharting", + "FederalCharting", + "MaritimeBathymetry", + "MaritimeCharting", + "EsriDefenseMapping" + ] + }, + "BackgroundGP64Bit":{ + "Installer": { + "Path": "[Desktop Background Geoprocessing (64-bit) Installer Path]" + } + } + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/LicenseManager-Standalone.json b/SampleConfigs/v3/v3.3.2/DesktopPro/LicenseManager-Standalone.json new file mode 100644 index 00000000..23391edf --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/LicenseManager-Standalone.json @@ -0,0 +1,20 @@ +{ + "AllNodes": [ + { + "NodeName": "[localhost -- Server where License Manager will be installed]", + "Role": [ + "LicenseManager" + ] + } + ], + "ConfigData": { + "LicenseManagerVersion": "[Version of License Manager -- 2019.2, 2020.0, etc.]", + "LicenseManager": { + "LicenseFilePath": "[License File Path (*.prvs) - License Manager ]", + "Installer": { + "Path": "[License Manager Installer Path]", + "InstallDir": "[License Install Dir - Ex. C:\\ArcGIS\\LM]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Concurrent.json b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Concurrent.json new file mode 100644 index 00000000..820598be --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Concurrent.json @@ -0,0 +1,52 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Pro" + ] + }, + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Pro" + ] + }, + { + "NodeName": "[Machine Name 3]", + "Role": [ + "LicenseManager" + ] + } + ], + "ConfigData": { + "ProVersion": "[Version of ArcGIS Pro ]", + "LicenseManagerVersion": "[Version of ArcGIS License Manager ]", + "Pro": { + "AuthorizationType": "CONCURRENT_USE", + "LockAuthSettings": "[ True(Default) | False ]", + "BlockAddIns": "[0 (Default All Addins Allowed), 1 (Signed by CA), 2 (Esri Addins Only), 3 (Esri Addins Only from Admin Folder), 4 (No Addins Allowed), 5 (Only Addins from Addmin Folder)]", + "SoftwareClass": "[Viewer | Editor | Professional]", + "PortalList": "[List of Portals for Pro]", + "AllUsers": "[1 (Per Machine Install)]", + "EsriLicenseHost": "[ License Host - [Machine Name 3] ]", + "EnableEUEI": "[ True (Default enables participation of Esri User Experience Improvement Program) | False]", + "CheckForUpdatesAtStartup": "[ True (Default enables automatic update notifications of ArcGIS Pro) | False ]", + "Installer": { + "Path": "[Pro Installer Path]", + "InstallDir": "[Pro Install Dir - Ex. C:\\ArcGIS\\Pro]", + "PatchesDir": "", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + }, + "LicenseManager": { + "LicenseFilePath": "[License File Path (*.prvs) - License Manager ]", + "Installer": { + "Path": "[License Manager Installer Path]", + "InstallDir": "[License Manager Install Dir - Ex. C:\\ArcGIS\\LicenseManager]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Named.json b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Named.json new file mode 100644 index 00000000..0a10bb31 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-Named.json @@ -0,0 +1,29 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Pro" + ] + } + ], + "ConfigData": { + "ProVersion": "[Version of ArcGIS Pro ]", + "Pro": { + "AuthorizationType": "NAMED_USER", + "BlockAddIns": "[0 (Default All Addins Allowed), 1 (Signed by CA), 2 (Esri Addins Only), 3 (Esri Addins Only from Admin Folder), 4 (No Addins Allowed), 5 (Only Addins from Addmin Folder)]", + "SoftwareClass": "[Viewer | Editor | Professional]", + "AllUsers": "[1 (Per Machine Install)]", + "EnableEUEI": "[ True (Default enables participation of Esri User Experience Improvement Program) | False ]", + "CheckForUpdatesAtStartup": "[ True (Default enables automatic update notifications of ArcGIS Pro) | False ]", + "Installer": { + "Path": "[Pro Installer Path]", + "InstallDir": "[Pro Install Dir - Ex. C:\\ArcGIS\\Pro]", + "PatchesDir": "", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-SingleUse.json b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-SingleUse.json new file mode 100644 index 00000000..fb2a568c --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/DesktopPro/Pro-SingleUse.json @@ -0,0 +1,39 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name 1]", + "Role": [ + "Pro" + ] + } + ], + "ConfigData": { + "ProVersion": "[Version of ArcGIS Pro ]", + "Pro": { + "LicenseFilePath": "[License File Path - Pro ]", + "AuthorizationType": "SINGLE_USE", + "LockAuthSettings": "[ True(Default) | False ]", + "BlockAddIns": "[0 (Default All Addins Allowed), 1 (Signed by CA), 2 (Esri Addins Only), 3 (Esri Addins Only from Admin Folder), 4 (No Addins Allowed), 5 (Only Addins from Addmin Folder)]", + "SoftwareClass": "[Viewer | Editor | Professional]", + "PortalList": "[List of Portals for Pro]", + "AllUsers": "[1 (Per Machine Install)]", + "EnableEUEI": "[ True (Default enables participation of Esri User Experience Improvement Program) | False]", + "CheckForUpdatesAtStartup": "[ True (Default enables automatic update notifications of ArcGIS Pro) | False ]", + "Installer": { + "Path": "[Pro Installer Path]", + "InstallDir": "[Pro Install Dir - Ex. C:\\ArcGIS\\Pro]", + "PatchesDir": "", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "Extensions":{ + "DataInteroperability":{ + "Installer": { + "Path": "[Data Interoperability Installer Path]" + } + } + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Database.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Database.json new file mode 100644 index 00000000..29c3e859 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Database.json @@ -0,0 +1,96 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "SQLServerClient" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "Databases": [ + { + "DatabaseServerHostName": "[SQL Server Node Name]", + "DatabaseName": "[Name of the Database to target]", + "DatabaseType": "SQLServerDatabase", + "DatabaseAdminUser": { + "UserName": "[DatabaseAdminUser UserName]", + "Password": "[DatabaseAdminUser Password]" + }, + "SDEUser": { + "UserName": "[SDEUser UserName]", + "Password": "[SDEUser Password]" + }, + "DatabaseUser": { + "UserName": "[DatabaseUser UserName]", + "Password": "[DatabaseUser Password]" + }, + "IsManaged": true, + "EnableGeodatabase": true + }, + { + "DatabaseServerHostName": "[External DB Host Name]", + "DatabaseName": "[Name of the Database to target]", + "DatabaseType": "Can be one of the following ['SQLServerDatabase','AzureSQLDatabase','AzurePostgreSQLDatabase','AzureMISQLDatabase']", + "DatabaseAdminUser": { + "UserName": "[DatabaseAdminUser UserName]", + "Password": "[DatabaseAdminUser Password]" + }, + "SDEUser": { + "UserName": "[SDEUser UserName]", + "Password": "[SDEUser Password]" + }, + "DatabaseUser": { + "UserName": "[DatabaseUser UserName]", + "Password": "[DatabaseUser Password]" + }, + "IsManaged": true, + "EnableGeodatabase": true + } + ], + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "SQLServerClient": [ + { + "Name": "Microsoft ODBC Driver 17 for SQL Server", + "InstallerPath": "C:\\Setups\\msodbcsql_17.4.1.1_x64.msi", + "ProductId": "72AFAF21-33FB-45A5-9468-A9EC07427F82", + "Arguments": " /quiet /qn IACCEPTMSODBCSQLLICENSETERMS=YES ADDLOCAL=ALL" + } + ], + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiMachine.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiMachine.json new file mode 100644 index 00000000..b42888ac --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiMachine.json @@ -0,0 +1,53 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine 1 Name]", + "Role": [ + "FileShare", + "Server" + ] + }, + { + "NodeName": "[Machine 2 Name]", + "Role": [ + "Server" + ] + }, + { + "NodeName": "[Machine 3 Name]", + "Role": [ + "Server" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "FileShareLocalPath": "[File Share Local Path]", + "FileShareName": "[File Share Name]", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\directories", + "ConfigStoreLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiServerRoles.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiServerRoles.json new file mode 100644 index 00000000..22202336 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultiServerRoles.json @@ -0,0 +1,122 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "RasterDataStoreItem" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeneralPurposeServer", + "AdditionalServerRoles":[ + "Geoevent", + "RasterAnalytics", + "WorkflowManagerServer", + "GeoAnalytics", + "ImageHosting" + ], + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + }, + "Extensions":{ + "DataInteroperability":{ + "Installer": { + "Path": "[Data Interoperability Installer Path]" + } + }, + "DataReviewer":{ + "Installer": { + "Path": "[Data Reviewer Installer Path]" + } + }, + "WorkflowManagerClassic":{ + "Installer": { + "Path": "[Workflow Manager Classic Installer Path]" + }, + "Features":[ + "Server", + "WebViewers", + "ALL" + ] + }, + "LocationReferencing":{ + "Installer": { + "Path": "[Location Referencing Installer Path]" + }, + "Features":[ + "PipeServer", + "RHServer", + "EventEditor", + "RCE", + "RoadwayReporter" + ] + }, + "MappingChartingSolution":{ + "Installer": { + "Path": "[Mapping and Charting Solutions Installer Path]" + }, + "Features":[ + "DefenseMapping", + "Maritime", + "ALL" + ] + } + } + }, + "GeoEventServer": { + "LicenseFilePath": "[License File Path - GeoEvent Server ]", + "Installer": { + "Path": "[GeoEvent Server Installer Path]", + "PatchesDir": "[Path to Directory with Patches for GeoEvent Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "EnableGeoeventSDK": "[ Optional - True | False(Default) - Enables GeoEvent SDK during installation.]" + }, + "WorkflowManagerServer": { + "LicenseFilePath": "[License File Path - Workflow Manager Server ]", + "Installer": { + "Path": "[Workflow Manager Server Installer Path]" + } + }, + "DataStoreItems": { + "RasterStore": { + "FileShareLocalPath": "[File Share Local Path]", + "FileShareName": "[File Share Name]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultipleWA-MultiContext.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultipleWA-MultiContext.json new file mode 100644 index 00000000..d7a7a8e8 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose-MultipleWA-MultiContext.json @@ -0,0 +1,71 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ], + "ServerContext":"[Node Server Context]", + "AdminAccessEnabled": true + }, + { + "NodeName": "[Machine Name]", + "Role": [ + "ServerWebAdaptor" + ], + "ServerContext":"[Node Server Context]", + "AdminAccessEnabled": false + }, + { + "NodeName": "[Machine Name]", + "Role": [ + "ServerWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeneralPurposeServer", + "ServerContext": "[Global Server Context]", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose.json new file mode 100644 index 00000000..028e782b --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeneralPurpose.json @@ -0,0 +1,91 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeneralPurposeServer", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + }, + "Extensions":{ + "DataInteroperability":{ + "Installer": { + "Path": "[Data Interoperability Installer Path]" + } + }, + "DataReviewer":{ + "Installer": { + "Path": "[Data Reviewer Installer Path]" + } + }, + "WorkflowManagerClassic":{ + "Installer": { + "Path": "[Workflow Manager Classic Installer Path]" + }, + "Features":[ + "Server", + "WebViewers", + "ALL" + ] + }, + "LocationReferencing":{ + "Installer": { + "Path": "[Location Referencing Installer Path]" + }, + "Features":[ + "PipeServer", + "RHServer", + "EventEditor", + "RCE", + "RoadwayReporter" + ] + }, + "MappingChartingSolution":{ + "Installer": { + "Path": "[Mapping and Charting Solutions Installer Path]" + }, + "Features":[ + "DefenseMapping", + "Maritime", + "ALL" + ] + } + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoAnalytics.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoAnalytics.json new file mode 100644 index 00000000..49b65804 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoAnalytics.json @@ -0,0 +1,47 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeoAnalytics", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoEvent.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoEvent.json new file mode 100644 index 00000000..828b227c --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-GeoEvent.json @@ -0,0 +1,62 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "GeoEvent", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "PatchesDir": "[Path to Directory with Patches for Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ], + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "GeoEventServer": { + "LicenseFilePath": "[License File Path - GeoEvent Server ]", + "Installer": { + "Path": "[GeoEvent Server Installer Path]", + "PatchesDir": "[Path to Directory with Patches for GeoEvent Server]", + "PatchInstallOrder": [ + "Array of patch names to install in the needed order" + ] + }, + "EnableGeoeventSDK": "[ Optional - True | False(Default) - Enables GeoEvent SDK during installation.]" + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Mission.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Mission.json new file mode 100644 index 00000000..a1098789 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Mission.json @@ -0,0 +1,74 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "MissionServer", + "ServerContext": "mission", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Mission Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgismissionserver\\directories", + "ConfigStoreLocation": "C:\\arcgismissionserver\\config-store", + "ServerDirectories": [ + { + "name": "arcgisworkspace", + "path": "C:\\arcgismissionserver\\directories\\arcgisworkspace", + "type": "WORKSPACE" + }, + { + "name": "arcgisoutput", + "path": "C:\\arcgismissionserver\\directories\\arcgisoutput", + "type": "OUTPUT" + }, + { + "name": "arcgissystem", + "path": "C:\\arcgismissionserver\\directories\\arcgissystem", + "type": "SYSTEM" + }, + { + "name": "arcgisjobs", + "path": "C:\\arcgismissionserver\\directories\\arcgisjobs", + "type": "JOBS" + } + ], + "ServerLogsLocation": "C:\\arcgismissionserver\\logs", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WebAdaptor": { + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook-MultiMachine.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook-MultiMachine.json new file mode 100644 index 00000000..9f32d90a --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook-MultiMachine.json @@ -0,0 +1,71 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ] + }, + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "FileShare" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "NotebookServer", + "ServerContext": "notebook", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Notebook Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] " + }, + "ServerDirectoriesRootLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\arcgisnotebookserver\\directories", + "ConfigStoreLocation": "\\\\[Fileshare Machine Name 1]\\[Fileshare Name]\\\\arcgisnotebookserver\\config-store", + "ContainerImagePaths": [ + "C:\\docker_images\\ArcGIS_Notebook_Docker_Standard_108.tar.gz", + "C:\\docker_images\\ArcGIS_Notebook_Docker_Advanced_108.tar.gz" + ], + "ServerDirectories": [ + { + "name": "arcgisworkspace", + "path": "[Required - DFS Shared Workspace - 'C:\\arcgisnotebookserver\\arcgisworkspace']", + "type": "WORKSPACE" + } + ], + "ServerLogsLocation": "C:\\arcgisnotebookserver\\logs", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WebAdaptor": { + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook.json new file mode 100644 index 00000000..60368c38 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-Notebook.json @@ -0,0 +1,80 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "NotebookServer", + "ServerContext": "notebook", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Notebook Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "NotebookServerSamplesDataPath": "[Optional - Notebook Server Samples Data Installer Path - Included starting 10.9]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] " + }, + "ServerDirectoriesRootLocation": "C:\\arcgisnotebookserver\\directories", + "ConfigStoreLocation": "C:\\arcgisnotebookserver\\config-store", + "ContainerImagePaths": [ + "C:\\docker_images\\ArcGIS_Notebook_Docker_Standard_108.tar.gz", + "C:\\docker_images\\ArcGIS_Notebook_Docker_Advanced_108.tar.gz" + ], + "ServerDirectories": [ + { + "name": "arcgisworkspace", + "path": "C:\\arcgisnotebookserver\\arcgisworkspace", + "type": "WORKSPACE" + }, + { + "name": "arcgisoutput", + "path": "C:\\arcgisnotebookserver\\arcgisoutput", + "type": "OUTPUT" + }, + { + "name": "arcgissystem", + "path": "C:\\arcgisnotebookserver\\arcgissystem", + "type": "SYSTEM" + }, + { + "name": "arcgisjobs", + "path": "C:\\arcgisnotebookserver\\arcgisjobs", + "type": "JOBS" + } + ], + "ServerLogsLocation": "C:\\arcgisnotebookserver\\logs", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WebAdaptor": { + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-RasterAnalytics-fileshare.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-RasterAnalytics-fileshare.json new file mode 100644 index 00000000..41c79f53 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-RasterAnalytics-fileshare.json @@ -0,0 +1,54 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "RasterDataStoreItem" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "RasterAnalytics", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "DataStoreItems": { + "RasterStore": { + "FileShareLocalPath": "[File Share Local Path]", + "FileShareName": "[File Share Name]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-WorkflowManager.json b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-WorkflowManager.json new file mode 100644 index 00000000..b5857044 --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/Gis Servers/GISServer-WorkflowManager.json @@ -0,0 +1,61 @@ +{ + "AllNodes": [ + { + "NodeName": "[Machine Name]", + "Role": [ + "Server", + "ServerWebAdaptor" + ] + } + ], + "ConfigData": { + "Version": "[Version of ArcGIS Deployment]", + "ServerRole": "WorkflowManagerServer", + "ServerContext": "workflowmanager", + "Credentials": { + "ServiceAccount": { + "Password": "[ServiceAccount Password]", + "UserName": "[ServiceAccount Username - Can be a Domain Account]", + "IsDomainAccount": false, + "IsMSAAccount": false + } + }, + "Server": { + "LicenseFilePath": "[License File Path - Server ]", + "Installer": { + "Path": "[Server Installer Path]", + "InstallDir": "[Server Install Dir - Ex. C:\\ArcGIS\\Server]", + "InstallDirPython": "[Python Install Dir - Ex. C:\\Python27] ", + "EnableArcMapRuntime": "[ Optional - True (Default) | False - Enables ArcMapRuntime. Available starting 10.9.1]", + "EnableDotnetSupport": "[ Optional - True | False (Default) - Enables .Net Extension Support. Available starting 10.9.1]" + }, + "ServerDirectoriesRootLocation": "C:\\arcgisserver\\directories", + "ConfigStoreLocation": "C:\\arcgisserver\\config-store", + "PrimarySiteAdmin": { + "UserName": "[PrimarySiteAdmin Username]", + "Password": "[PrimarySiteAdmin Password]" + } + }, + "WorkflowManagerServer": { + "LicenseFilePath": "[License File Path - Workflow Manager Server ]", + "Installer": { + "Path": "[Workflow Manager Server Installer Path]" + } + }, + "WebAdaptor": { + "AdminAccessEnabled": true, + "Installer": { + "Path": "[WebAdaptor Installer Path]" + } + }, + "Federation": { + "PortalHostName": "[Portal Host Name (FQDN) with which this site needs to be federated]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "PortalAdministrator": { + "UserName": "admin", + "Password": "changeit" + } + } + } +} \ No newline at end of file diff --git a/SampleConfigs/v3/v3.3.2/PublishGISService.json b/SampleConfigs/v3/v3.3.2/PublishGISService.json new file mode 100644 index 00000000..0a0f87db --- /dev/null +++ b/SampleConfigs/v3/v3.3.2/PublishGISService.json @@ -0,0 +1,32 @@ +{ + "ServerNode": "[Machine Name]", + "CertificateFile": "", + "Thumbprint": "", + "PortalHostName": "[Portal Host Name (FQDN)]", + "PortalPort": "[Port on which Portal is listening ex. - 443]", + "PortalContext": "[Context of the Portal ex. - portal]", + "ServerHostName": "[Server Host Name (FQDN) with which the publishing needs to happen]", + "ServerPort": "[Port on which Server is listening ex. - 443]", + "ServerContext": "[Context of the Server ex. - Server]", + "PublisherAccountCredential": { + "UserName": "[PublisherAccount Username]", + "Password": "[PublisherAccount Password]", + "PasswordFile": "" + }, + "GISServices": [ + { + "Name": "", + "Type": "", + "PathToItemInfoFile": "", + "PathToSourceFile": "", + "Folder": "" + }, + { + "Name": "", + "Type": "", + "PathToItemInfoFile": "", + "PathToSourceFile": "", + "Folder": "" + } + ] +} \ No newline at end of file