Skip to content

Commit

Permalink
Merge pull request #128 from Esri/v3.2.0
Browse files Browse the repository at this point in the history
Release v3.2.0
  • Loading branch information
pbobov authored Jan 22, 2018
2 parents 378a438 + 6a89982 commit 72c6ad0
Show file tree
Hide file tree
Showing 76 changed files with 1,925 additions and 381 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
Licensing
---------

Copyright 2017 Esri
Copyright 2018 Esri

Licensed under the Apache License, Version 2.0 (the "License");
You may not use this file except in compliance with the License.
Expand All @@ -46,5 +46,5 @@ limitations under the License.

A copy of the license is available in the repository's [License.txt](https://github.com/Esri/arcgis-cookbook/blob/master/License.txt?raw=true) file.

[](Esri Tags: ArcGIS Chef Cookbook)
[](Esri Tags: ArcGIS Chef Cookbooks)
[](Esri Language: Ruby)
81 changes: 81 additions & 0 deletions cookbooks/arcgis-desktop/.kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
---
driver:
name: vagrant
customize:
memory: 6144
cpuexecutioncap: 50
gui: false

provisioner:
name: chef_zero
require_chef_omnibus: 13.3

platforms:
- name: windows-2016
- name: windows-2012r2
- name: windows-2008r2
- name: windows-7
- name: windows-81
- name: centos-6.7
- name: centos-7.2
- name: ubuntu-16.04

suites:
- name: desktop
driver:
synced_folders:
- ["/arcgis/setups/windows/ArcGIS_Desktop", "C:/temp/setups/ArcGIS_Desktop"]
- ["/arcgis/setups/authorization_files/Version10.6/ArcGIS_Desktop_Advanced_SU", "C:/temp/auth_files/ArcGIS_Desktop"]
run_list:
#- recipe[ms_dotnet::ms_dotnet4]
- recipe[arcgis-desktop]
attributes:
#ms_dotnet:
#v4:
#version: "4.5.1"
arcgis:
version: "10.6"
desktop:
setup: "C:\\temp\\setups\\ArcGIS_Desktop\\Setup.exe"
authorization_file: "C:\\temp\\auth_files\\ArcGIS_Desktop\\DTAdvanced.prvc"
software_class: "Viewer"
seat_preference: "Fixed"
desktop_config: true
excludes:
- centos-6.7
- centos-7.2
- ubuntu-16.04

- name: licensemanager
driver:
synced_folders:
- ["/arcgis/setups/windows/LicenseManager", "C:/temp/setups/LicenseManager"]
run_list:
- recipe[arcgis-desktop::licensemanager]
attributes:
arcgis:
version: "10.6"
licensemanager:
setup: "C:\\temp\\setups\\LicenseManager\\Setup.exe"
excludes:
- centos-6.7
- centos-7.2
- ubuntu-16.04

- name: licensemanager-linux
driver:
synced_folders:
- ["/arcgis/setups/linux/LicenseManager", "/tmp/licensemanager-cd"]
run_list:
- recipe[arcgis-desktop::licensemanager]
attributes:
arcgis:
version: "10.6"
licensemanager:
setup: "/tmp/licensemanager-cd/Setup"
excludes:
- windows-2016
- windows-2012r2
- windows-2008r2
- windows-7
- windows-81
4 changes: 4 additions & 0 deletions cookbooks/arcgis-desktop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ arcgis-desktop cookbook CHANGELOG

This file is used to list changes made in each version of the arcgis-desktop cookbook.

3.2.0
-----
- Added support for ArcGIS 10.6.

3.1.0
-----
- Added support for ArcGIS 10.5.1.
Expand Down
3 changes: 2 additions & 1 deletion cookbooks/arcgis-desktop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Requirements
* 10.4.1
* 10.5
* 10.5.1
* 10.6

### Supported ArcGIS software
* ArcGIS Desktop (Windows only)
Expand Down Expand Up @@ -73,7 +74,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
Licensing
---------

Copyright 2017 Esri
Copyright 2018 Esri

Licensed under the Apache License, Version 2.0 (the "License");
You may not use this file except in compliance with the License.
Expand Down
5 changes: 4 additions & 1 deletion cookbooks/arcgis-desktop/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

default['arcgis']['run_as_user'] = 'arcgis'
default['arcgis']['run_as_password'] = 'Pa$$w0rdPa$$w0rd'
default['arcgis']['version'] = '10.5.1'
default['arcgis']['version'] = '10.6'
default['arcgis']['desktop']['version'] = node['arcgis']['version']

case node['platform']
Expand All @@ -42,6 +42,9 @@
default['arcgis']['licensemanager']['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'

case node['arcgis']['desktop']['version']
when '10.6'
default['arcgis']['desktop']['product_code'] = '{F8206086-367E-44E4-9E24-92E9E057A63D}'
default['arcgis']['licensemanager']['product_code'] = '{D6AF20B5-825F-44A9-915D-C2868CBD59F3}'
when '10.5.1'
default['arcgis']['desktop']['product_code'] = '{4740FC57-60FE-45BB-B513-3309F6B73183}'
default['arcgis']['licensemanager']['product_code'] = '{DF06C3DC-54B5-49A1-9756-B68FD65A0AD0}'
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/arcgis-desktop/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache 2.0'
description 'Installs and configures ArcGIS Desktop'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '3.1.0'
version '3.2.0'

depends 'windows'
depends 'limits'
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/arcgis-desktop/providers/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
if platform?('windows')
user node['arcgis']['run_as_user'] do
comment 'ArcGIS user account'
supports :manage_home => true
manage_home true
password node['arcgis']['run_as_password']
not_if { node['arcgis']['run_as_user'].include? '\\' } # do not try to create domain accounts
action :create
Expand All @@ -32,7 +32,7 @@
user @new_resource.name do
username node['arcgis']['run_as_user']
comment 'ArcGIS user account'
supports :manage_home => true
manage_home true
home '/home/' + node['arcgis']['run_as_user']
action :create
end
Expand Down
148 changes: 148 additions & 0 deletions cookbooks/arcgis-enterprise/.kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
---
driver:
name: vagrant
customize:
memory: 8192
cpus: 4
cpuexecutioncap: 75
gui: false

provisioner:
name: chef_zero
require_chef_omnibus: 13.3

platforms:
- name: windows-2016
- name: windows-2012r2
- name: windows-2008r2
- name: windows-7
- name: windows-81
- name: centos-6.7
- name: centos-7.2
- name: ubuntu-16.04

suites:
- name: webgis
driver:
network:
- ["forwarded_port", {guest: 6080, host: 16080}]
- ["forwarded_port", {guest: 6443, host: 16443}]
- ["forwarded_port", {guest: 7443, host: 17443}]
synced_folders:
- ["/arcgis/setups/windows/ArcGIS_Server", "C:/temp/setups/ArcGIS_Server"]
- ["/arcgis/setups/windows/ArcGIS_DataStore", "C:/temp/setups/ArcGIS_DataStore"]
- ["/arcgis/setups/windows/Portal_for_ArcGIS", "C:/temp/setups/Portal_for_ArcGIS"]
- ["/arcgis/setups/windows/ArcGIS_WebAdaptorIIS", "C:/temp/setups/WebAdaptorIIS"]
- ["/arcgis/setups/authorization_files/Version10.6/ArcGIS_Server/Advanced", "C:/temp/authorization_files/ArcGIS_Server"]
- ["/arcgis/setups/authorization_files/Version10.6/Portal_for_ArcGIS", "C:/temp/authorization_files/Portal_for_ArcGIS"]
- ["/data", "C:/temp/data"]
run_list:
- recipe[arcgis-enterprise::enterprise_validate]
- recipe[arcgis-enterprise::system]
- recipe[esri-iis]
- recipe[arcgis-enterprise::server]
- recipe[arcgis-enterprise::server_security]
- recipe[arcgis-enterprise::server_wa]
- recipe[arcgis-enterprise::datastore]
- recipe[arcgis-enterprise::portal]
- recipe[arcgis-enterprise::portal_wa]
- recipe[arcgis-enterprise::federation]
- recipe[arcgis-enterprise::services]
- recipe[arcgis-enterprise::enterprise_uninstalled]
- recipe[arcgis-enterprise::clean]
attributes:
chef_client:
config:
log_level: ":debug"
arcgis:
version: "10.6"
configure_windows_firewall: true
hosts:
test.com: ""
server:
setup: "C:\\temp\\setups\\ArcGIS_Server\\Setup.exe"
authorization_file: "C:\\temp\\authorization_files\\ArcGIS_Server\\Server_Ent_Adv.ecp"
wa_url: "http://test.com/server"
url: "http://test.com:6080/arcgis"
domain_name: "test.com"
services:
- name: "map_bv"
folder: ""
type: "MapServer"
definition_file: "C:/temp/data/map_bv.sd"
properties:
maxInstancesPerNode: 4
data_store:
setup: "C:\\temp\\setups\\ArcGIS_DataStore\\Setup.exe"
portal:
setup: "C:\\temp\\setups\\Portal_for_ArcGIS\\Setup.exe"
authorization_file: "C:\\temp\\authorization_files\\Portal_for_ArcGIS\\portal_25_50.ecp"
wa_url: "https://test.com/portal"
url: "https://test.com:7443/arcgis"
domain_name: "test.com"
web_adaptor:
setup: "C:\\temp\\setups\\WebAdaptorIIS\\Setup.exe"
excludes:
- centos-6.7
- centos-7.2
- ubuntu-16.04

- name: webgis-linux
driver:
network:
- ["forwarded_port", {guest: 6080, host: 26080}]
- ["forwarded_port", {guest: 6443, host: 26443}]
- ["forwarded_port", {guest: 7443, host: 27443}]
synced_folders:
- ["/arcgis/setups/linux/ArcGISServer", "/tmp/server-cd"]
- ["/arcgis/setups/linux/ArcGISDataStore", "/tmp/data-store-cd"]
- ["/arcgis/setups/linux/ArcGISPortal", "/tmp/portal-cd"]
- ["/arcgis/setups/linux/WebAdaptor", "/tmp/web-adaptor-cd"]
- ["/arcgis/setups/authorization_files/Version10.6/ArcGIS_Server/Advanced", "/tmp/authorization_files/ArcGISServer"]
- ["/arcgis/setups/authorization_files/Version10.6/Portal_for_ArcGIS", "/tmp/authorization_files/ArcGISPortal"]
run_list:
- recipe[arcgis-enterprise::system]
- recipe[esri-tomcat]
- recipe[iptables]
- recipe[arcgis-enterprise::iptables]
- recipe[arcgis-enterprise::server]
- recipe[arcgis-enterprise::server_wa]
- recipe[arcgis-enterprise::datastore]
- recipe[arcgis-enterprise::portal]
- recipe[arcgis-enterprise::portal_wa]
- recipe[arcgis-enterprise::federation]
- recipe[arcgis-enterprise::patches]
attributes:
java:
install_flavor: "oracle"
jdk_version: "8"
oracle:
accept_oracle_download_terms: true
arcgis:
version: "10.6"
hosts:
test.com: ""
server:
setup: "/tmp/server-cd/Setup"
authorization_file: "/tmp/authorization_files/ArcGISServer/Server_Ent_Adv.ecp"
wa_url: "http://test.com/server"
url: "http://test.com:6080/arcgis"
domain_name: "test.com"
data_store:
setup: "/tmp/data-store-cd/Setup"
portal:
setup: "/tmp/portal-cd/Setup"
authorization_file: "/tmp/authorization_files/ArcGISPortal/portal_25_50.ecp"
wa_url: "https://test.com/portal"
url: "https://test.com:7443/arcgis"
domain_name: "test.com"
web_adaptor:
setup: "/tmp/web-adaptor-cd/Setup"
web_server:
webapp_dir: "/opt/tomcat_arcgis/webapps"
excludes:
- windows-2016
- windows-2012r2
- windows-2008r2
- windows-7
- windows-81
5 changes: 3 additions & 2 deletions cookbooks/arcgis-enterprise/Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ cookbook 'hostsfile', '~> 2.4'
cookbook 'limits', '~> 1.0'
cookbook 'authbind', '~> 0.1'
cookbook 'iptables', '~> 1.0'
cookbook 'windows', '~> 1.39'
cookbook 'windows', '~> 3.1'
cookbook 'openssl', '~> 4.0'
cookbook 'java_properties', '~> 0.1'
cookbook 'esri-tomcat', path: '../esri-tomcat'
cookbook 'esri-iis', path: '../esri-iis'
cookbook 'tomcat', path: '../tomcat'
cookbook 'yum-epel', path: '../yum-epel'
cookbook 'java'
cookbook 'nfs'

7 changes: 7 additions & 0 deletions cookbooks/arcgis-enterprise/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ arcgis-enterprise cookbook CHANGELOG

This file is used to list changes made in each version of the arcgis-enterprise cookbook.

3.2.0
-----
- Support for ArcGIS Enterprise 10.6.
- Support for Chef-Client 13.
- Setting maximum heap size of ArcSOC processes.
- Support upgrade of ArcGIS Enterprise on Linux.

3.1.0
-----
- Added support for ArcGIS Enterprise 10.5.1.
Expand Down
Loading

0 comments on commit 72c6ad0

Please sign in to comment.