Merge pull request #22 from shailesh91/master

Fixes Issues Listed on Github #10 #16 #17 #18 #19 #20 #21

.gitattributes

@@ -0,0 +1,21 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted
+# to native line endings on checkout.
+*.md            text
+*.gitattributes text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.ps1    text  eol=crlf
+*.psm1   text  eol=crlf
+*.psd1   text  eol=crlf
+*.psc1   text  eol=crlf
+*.ps1xml text  eol=crlf
+*.clixml text  eol=crlf
+*.xml    text  eol=crlf
+*.txt    text  eol=crlf
+
+# Denote all files that are truly binary and should not be mergeable.
+*.dll binary
+*.exe binary

Modules/ArcGIS/ArcGIS.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Esri
 #
-# Generated on: 1/30/2018
+# Generated on: 3/2/2018
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.8.2'
+ModuleVersion = '0.8.3'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

Modules/ArcGIS/ArcGIS.psm1

@@ -1,4 +1,4 @@
-function Get-FQDN
+function Get-FQDN
 {    
     [CmdletBinding()]
     param(

Modules/ArcGIS/ArcGISUtility.psm1

@@ -25,13 +25,9 @@ function Get-ServerToken
         [System.String]
 		$ServerSiteName = 'arcgis', 
 
-		[Parameter(Mandatory=$true)]
-        [System.String]
-		$UserName, 
-
-		[Parameter(Mandatory=$true)]
-        [System.String]
-		$Password, 
+		[parameter(Mandatory = $true)]
+		[System.Management.Automation.PSCredential]
+		$Credential,
 
 		[Parameter(Mandatory=$true)]
         [System.String]
@@ -40,7 +36,7 @@ function Get-ServerToken
         [System.Int32]$Expiration=1000
     )
 
-    Invoke-ArcGISWebRequest -Url ($ServerEndPoint.TrimEnd('/') + "/$ServerSiteName/admin/generateToken") -HttpFormParameters @{ username = $UserName; password = $Password; client = 'referer'; referer = $Referer; expiration = $Expiration; f = 'json' } -Referer $Referer -TimeOutSec 30 
+    Invoke-ArcGISWebRequest -Url ($ServerEndPoint.TrimEnd('/') + "/$ServerSiteName/admin/generateToken") -HttpFormParameters @{ username = $Credential.UserName; password = $Credential.GetNetworkCredential().Password; client = 'referer'; referer = $Referer; expiration = $Expiration; f = 'json' } -Referer $Referer -TimeOutSec 30 
 }
 
 
@@ -56,13 +52,9 @@ function Get-PortalToken
         [System.String]
 		$SiteName = 'arcgis', 
 
-		[Parameter(Mandatory=$true)]
-        [System.String]
-		$UserName, 
-
-		[Parameter(Mandatory=$true)]
-        [System.String]
-		$Password, 
+        [parameter(Mandatory = $true)]
+		[System.Management.Automation.PSCredential]
+		$Credential,
 
 		[Parameter(Mandatory=$true)]
         [System.String]
@@ -73,7 +65,7 @@ function Get-PortalToken
 		$Port = 7443
     )
 
-    Invoke-ArcGISWebRequest -Url "https://$($PortalHostName):$($Port)/$SiteName/sharing/rest/generateToken" -HttpFormParameters @{ username = $UserName; password = $Password; referer = $Referer; f = 'json' } -Referer $Referer -LogResponse  
+    Invoke-ArcGISWebRequest -Url "https://$($PortalHostName):$($Port)/$SiteName/sharing/rest/generateToken" -HttpFormParameters @{ username = $Credential.UserName; password = $Credential.GetNetworkCredential().Password; referer = $Referer; f = 'json' } -Referer $Referer -LogResponse  
 }
 
 function Check-ResponseStatus($Response, $Url)
@@ -159,7 +151,7 @@ function Wait-ForServiceToReachDesiredState
     }
 
     Write-Verbose "Waiting $SleepTimeInSeconds seconds."
-    Sleep -Seconds $SleepTimeInSeconds
+    Start-Sleep -Seconds $SleepTimeInSeconds
   }
 }
 
@@ -222,7 +214,7 @@ function Wait-ForUrl
             }
         }
         if(-not $Done) {
-            Sleep -Seconds $SleepTimeInSeconds
+            Start-Sleep -Seconds $SleepTimeInSeconds
             $TotalElapsedTimeInSeconds += $SleepTimeInSeconds
         }
     }

Modules/ArcGIS/Configuration/ArcGISConfigure.ps1

@@ -752,8 +752,8 @@ Configuration ArcGISConfigure
                     }
 
                     $IsMultiMachinePortal = (($AllNodes | Where-Object { $_.Role -icontains 'Portal' }  | Measure-Object).Count -gt 1)
-                    if($IsMultiMachinePortal -or ($ConfigData.PortalEndPoint -as [ipaddress]))
-                    {
+                    <#if($IsMultiMachinePortal -or ($ConfigData.PortalEndPoint -as [ipaddress]))
+                    {#>
                         xFirewall Portal_FirewallRules
                         {
                                 Name                  = "PortalforArcGIS" 
@@ -767,7 +767,7 @@ Configuration ArcGISConfigure
                                 Protocol              = "TCP" 
                         }
                         $Depends += @('[xFirewall]Portal_FirewallRules')
-                    }
+                    <#}
                     else 
                     {  # If single machine, need to open 7443 to allow federation over private portal URL and 6443 for changeServerRole
                         xFirewall Portal_FirewallRules
@@ -779,23 +779,10 @@ Configuration ArcGISConfigure
                                 Access                = "Allow" 
                                 State                 = "Enabled" 
                                 Profile               = ("Domain","Private","Public")
-                                LocalPort             = ("7443")                         
-                                Protocol              = "TCP" 
-                        }
-
-                        xFirewall ServerFederation_FirewallRules
-                        {
-                                Name                  = "ArcGISforServer-Federation" 
-                                DisplayName           = "ArcGIS for Server" 
-                                DisplayGroup          = "ArcGIS for Server" 
-                                Ensure                = 'Present'
-                                Access                = "Allow" 
-                                State                 = "Enabled" 
-                                Profile               = ("Domain","Private","Public")
-                                LocalPort             = ("6443")                         
+                                LocalPort             = ("7080","7443")                         
                                 Protocol              = "TCP" 
                         }
-                    }
+                    }#>
 
                     if($IsMultiMachinePortal) 
                     {
@@ -809,7 +796,7 @@ Configuration ArcGISConfigure
                                 Access                = "Allow" 
                                 State                 = "Enabled" 
                                 Profile               = ("Domain","Private","Public")
-                                RemotePort            = ("7654","7120","7220", "7005", "7099", "7199", "5701", "5702")  # Elastic Search uses 7120,7220 and Postgres uses 7654 for replication, Hazelcast uses 5701 and 5702 (extra 2 ports for situations where unable to get port)
+                                RemotePort            = ("7120","7220", "7005", "7099", "7199", "5701", "5702", "5703")  # Elastic Search uses 7120,7220 and Postgres uses 7654 for replication, Hazelcast uses 5701 and 5702 (extra 2 ports for situations where unable to get port)
                                 Direction             = "Outbound"                       
                                 Protocol              = "TCP" 
                         }  
@@ -824,7 +811,7 @@ Configuration ArcGISConfigure
                                 Access                = "Allow" 
                                 State                 = "Enabled" 
                                 Profile               = ("Domain","Private","Public")
-                                LocalPort             = ("7120","7220", "5701", "5702")  # Elastic Search uses 7120,7220, Hazelcast uses 5701 and 5702
+                                LocalPort             = ("7120","7220","5701", "5702", "5703")  # Elastic Search uses 7120,7220, Hazelcast uses 5701 and 5702
                                 Protocol              = "TCP" 
                         }  
                         $Depends += @('[xFirewall]Portal_Database_InBound')
@@ -1689,6 +1676,7 @@ Configuration ArcGISConfigure
                         FileShareLocalPath = $ConfigurationData.ConfigData.DataStoreItems.RasterStore.FileShareLocalPath
                         Ensure = 'Present'
                         Credential = $SACredential
+                        IsDomainAccount = $ConfigurationData.ConfigData.Credentials.ServiceAccount.IsDomainAccount
                     }
 
                     $DataStorePath = "\\$($env:ComputerName)\$($ConfigurationData.ConfigData.DataStoreItems.RasterStore.FileShareName)"
@@ -1719,6 +1707,7 @@ Configuration ArcGISConfigure
                         Ensure = 'Present'
                         Credential = $SACredential
                         FilePaths = ($FilePathsArray -join ",")
+                        IsDomainAccount = $ConfigurationData.ConfigData.Credentials.ServiceAccount.IsDomainAccount
                     }
                 }
                 'LoadBalancer'{

Modules/ArcGIS/Configuration/ArcGISUninstall.ps1

@@ -1,4 +1,4 @@
-Configuration ArcGISUninstall
+Configuration ArcGISUninstall
 {
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
     Import-DscResource -ModuleName ArcGIS

Modules/ArcGIS/Configuration/Upgrades/PortalUpgrade.ps1

@@ -1,5 +1,4 @@
 Configuration PortalUpgrade{
-
     param(
         [parameter(Mandatory = $true)]
         [System.String]
@@ -43,7 +42,7 @@ Configuration PortalUpgrade{
 
         [parameter(Mandatory = $false)]
         [System.Boolean]
-        $IsSADomainAccount = $False
+        $IsSADomainAccount = $False,
 
         [parameter(Mandatory = $true)]
         [System.Management.Automation.PSCredential]
@@ -113,6 +112,7 @@ Configuration PortalUpgrade{
                     PortalEndPoint = $MachineFQDN
                     PrimarySiteAdmin = $PrimarySiteAdmin
                     StandbyMachine = $StandbyMachine
+                    Version = $Version
                 }
 
                 $Depends += '[ArcGIS_PortalUnregister]UnregisterStandyPortal'
@@ -165,6 +165,7 @@ Configuration PortalUpgrade{
                 Ensure = "Present"
                 DataDir = $DataDirsForPortal
                 DependsOn =  $Depends
+                IsDomainAccount = $IsSADomainAccount
             }
             $Depends += '[ArcGIS_Service_Account]Portal_RunAs_Account'
 
@@ -278,6 +279,7 @@ Configuration PortalUpgrade{
                 Ensure = "Present"
                 DataDir = $DataDirsForPortal
                 DependsOn = $Depends
+                IsDomainAccount = $IsSADomainAccount
             }
         }        
     }