Merge pull request #64 from Esri/v3.0.0

V3.0.0

README.md

@@ -5,13 +5,16 @@ This repository contains ArcGIS Chef cookbooks used to help simplify and automat
 
 Included cookbooks:
 
-* [arcgis-server](cookbooks/arcgis-server) (installs and configures ArcGIS Server, ArcGIS Data Store, Portal for ArcGIS, ArcGIS WebAdaptor)
-* [arcgis-geoevent](cookbooks/arcgis-geoevent) (installs and configures ArcGIS GeoEvent Extension for Server)
-* [arcgis-desktop](cookbooks/arcgis-desktop) (installs and configures ArcGIS for Desktop)
+* [arcgis-enterprise](cookbooks/arcgis-enterprise) (installs and configures ArcGIS Server, ArcGIS Data Store, Portal for ArcGIS, ArcGIS WebAdaptor)
+* [arcgis-geoevent](cookbooks/arcgis-geoevent) (installs and configures ArcGIS GeoEvent Server)
+* [arcgis-insights](cookbooks/arcgis-insights) (installs and configures Insights for ArcGIS)
+* [arcgis-desktop](cookbooks/arcgis-desktop) (installs and configures ArcGIS Desktop)
 * [arcgis-pro](cookbooks/arcgis-pro) (installs and configures ArcGIS Pro)
 * [esri-tomcat](cookbooks/esri-tomcat) (installs and configures Apache Tomcat for using with ArcGIS Web Adaptor)
+* [esri-iis](cookbooks/esri-iis) (enables IIS features required by ArcGIS Web Adaptor (IIS) and configures HTTPS binding.)
 
-Sample JSON attribute files for different ArcGIS deployment patterns (Web GIS, Server GIS) are available at [roles](roles) folder.
+
+Sample JSON attribute files for different ArcGIS deployment patterns are available at [roles](roles) folder.
 
 See [wiki](https://github.com/Esri/arcgis-cookbook/wiki) pages and cookbooks' README.md files for more information about using ArcGIS cookbooks.
 

cookbooks/arcgis-desktop/CHANGELOG.md

@@ -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.0.0
+-----
+- Updated ArcGIS product names
+
 2.3.1
 -----
 - Added support for ArcGIS 10.5.

cookbooks/arcgis-desktop/README.md

@@ -1,13 +1,13 @@
 arcgis-desktop cookbook
 ===============
 
-This cookbook installs and configures ArcGIS for Desktop.
+This cookbook installs and configures ArcGIS Desktop.
 
 Requirements
 ------------
 
 ### Supported ArcGIS software
-* ArcGIS 10.4/10.4.1/10.5 for Desktop (Windows only)
+* ArcGIS 10.4/10.4.1/10.5 Desktop (Windows only)
 * ArcGIS 10.4/10.4.1/10.5 License Manager 
 
 ### Platforms
@@ -24,15 +24,15 @@ The following cookbooks are required:
 Attributes
 ----------
 * `node['arcgis']['version']` = ArcGIS version. Default value is `10.5`.
-* `node['arcgis']['desktop']['setup']` = The location of ArcGIS for Desktop setup executable. Default location is `C:\Temp\ArcGISDesktop\Setup.exe`.
-* `node['arcgis']['desktop']['lp-setup']` = The location of language pack for ArcGIS for Desktop. Default location is `nil`.
-* `node['arcgis']['desktop']['install_dir']` = ArcGIS for Desktop installation directory. By default, ArcGIS for Desktop is installed to `%ProgramFiles(x86)%\ArcGIS`.
-* `node['arcgis']['desktop']['install_features']` = Comma-separated list of ArcGIS for Desktop features to install. Default value is `ALL`.
-* `node['arcgis']['desktop']['authorization_file']` = ArcGIS for Desktop authorization file path. Default location and file name are `C:\\Temp\\license.ecp`.
-* `node['arcgis']['desktop']['authorization_file_version']` = ArcGIS for Desktop authorization file version. Default value is `10.4`.
+* `node['arcgis']['desktop']['setup']` = The location of ArcGIS Desktop setup executable. Default location is `C:\Temp\ArcGISDesktop\Setup.exe`.
+* `node['arcgis']['desktop']['lp-setup']` = The location of language pack for ArcGIS Desktop. Default location is `nil`.
+* `node['arcgis']['desktop']['install_dir']` = ArcGIS Desktop installation directory. By default, ArcGIS Desktop is installed to `%ProgramFiles(x86)%\ArcGIS`.
+* `node['arcgis']['desktop']['install_features']` = Comma-separated list of ArcGIS Desktop features to install. Default value is `ALL`.
+* `node['arcgis']['desktop']['authorization_file']` = ArcGIS Desktop authorization file path. Default location and file name are `C:\\Temp\\license.ecp`.
+* `node['arcgis']['desktop']['authorization_file_version']` = ArcGIS Desktop authorization file version. Default value is `10.4`.
 * `node['arcgis']['desktop']['esri_license_host']` = Hostname of ArcGIS License Manager. Default hostname is `%COMPUTERNAME%`.
-* `node['arcgis']['desktop']['software_class']` = ArcGIS for Desktop software class <Viewer|Editor|Professional>. Default value is `Viewer`.
-* `node['arcgis']['desktop']['seat_preference']` = ArcGIS for Desktop license seat preference <Fixed|Float>. Default value is `Fixed`.
+* `node['arcgis']['desktop']['software_class']` = ArcGIS Desktop software class <Viewer|Editor|Professional>. Default value is `Viewer`.
+* `node['arcgis']['desktop']['seat_preference']` = ArcGIS Desktop license seat preference <Fixed|Float>. Default value is `Fixed`.
 * `node['arcgis']['licensemanager']['setup']` = The location of ArcGIS License Manager setup executable. Default location is `C:\Temp\ArcGISLicenseManager\Setup.exe` on Windows, `/tmp/licensemanager-cd/Setup` on Linux.
 * `node['arcgis']['licensemanager']['lp-setup']` = The location of language pack for ArcGIS License Manager. Default location is `nil`.
 * `node['arcgis']['licensemanager']['install_dir']` = ArcGIS License Manager installation directory. By default, the license manager is installed to `%ProgramFiles(x86)%\ArcGIS` on Windows and `/` on Linux.
@@ -67,7 +67,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
 Licensing
 ---------
 
-Copyright 2016 Esri
+Copyright 2017 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 You may not use this file except in compliance with the License.
@@ -82,5 +82,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 Desktop Chef Cookbook)
 [](Esri Language: Ruby)

cookbooks/arcgis-desktop/attributes/default.rb

@@ -42,6 +42,9 @@
   default['arcgis']['licensemanager']['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
   case node['arcgis']['desktop']['version']
+  when '10.5.1'
+    default['arcgis']['desktop']['product_code'] = '{4740FC57-60FE-45BB-B513-3309F6B73183}'
+    default['arcgis']['licensemanager']['product_code'] = '{DF06C3DC-54B5-49A1-9756-B68FD65A0AD0}'
   when '10.5'
     default['arcgis']['desktop']['product_code'] = '{76B58799-3448-4DE4-BA71-0FDFAA2A2E9A}'
     default['arcgis']['licensemanager']['product_code'] = '{3A024FEA-3E14-4257-87D0-8FCA03257560}'

cookbooks/arcgis-desktop/metadata.rb

@@ -2,9 +2,9 @@
 maintainer       'Esri'
 maintainer_email '[email protected]'
 license          'Apache 2.0'
-description      'Installs and configures ArcGIS for Desktop'
+description      'Installs and configures ArcGIS Desktop'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '2.3.1'
+version          '3.0.0'
 
 depends          'windows'
 depends          'limits'

cookbooks/arcgis-desktop/recipes/default.rb

@@ -17,11 +17,11 @@
 # limitations under the License.
 #
 
-arcgis_desktop_desktop 'Verify ArcGIS for Desktop system requirements' do
+arcgis_desktop_desktop 'Verify ArcGIS Desktop system requirements' do
   action :system
 end
 
-arcgis_desktop_desktop 'Install ArcGIS for Desktop' do
+arcgis_desktop_desktop 'Install ArcGIS Desktop' do
   setup node['arcgis']['desktop']['setup']
   product_code node['arcgis']['desktop']['product_code']
   install_dir node['arcgis']['desktop']['install_dir']
@@ -36,7 +36,7 @@
   action :install
 end
 
-arcgis_desktop_desktop 'Authorize ArcGIS for Desktop' do
+arcgis_desktop_desktop 'Authorize ArcGIS Desktop' do
   authorization_file node['arcgis']['desktop']['authorization_file']
   authorization_file_version node['arcgis']['desktop']['authorization_file_version']
   action :authorize

cookbooks/arcgis-desktop/recipes/uninstall.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-arcgis_desktop_desktop 'Uninstall ArcGIS for Desktop' do
+arcgis_desktop_desktop 'Uninstall ArcGIS Desktop' do
   product_code node['arcgis']['desktop']['product_code']
   install_dir node['arcgis']['desktop']['install_dir']
   only_if { Utils.product_installed?(node['arcgis']['desktop']['product_code']) }

cookbooks/arcgis-server/Berksfile → cookbooks/arcgis-enterprise/Berksfile

@@ -11,6 +11,8 @@ cookbook  'iptables', '~> 1.0'
 cookbook  'windows', '~> 1.39'
 cookbook  'openssl', '~> 4.0'
 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'

cookbooks/arcgis-enterprise/CHANGELOG.md

@@ -0,0 +1,17 @@
+arcgis-enterprise cookbook CHANGELOG
+================================
+
+This file is used to list changes made in each version of the arcgis-enterprise cookbook.
+
+3.0.0
+-----
+- 'iis' recipe moved to new 'esri-iis' cookbook.
+- Supported Windows firewall configuration for ArcGIS Enterprise applications.
+- Introduced local ArcGIS software repository.
+- Supported extraction of ArcGIS software setups from archives to a local setup repository.
+- Completed the ArcGIS Server 10.5 upgrade procedure.
+- Added recipe to run user-defined post installation script.
+- Added creation of network shares in 'fileserver' recipe.
+- Suppored setting log level in Portal for ArcGIS.
+- arcgis-server cookbook renamed to arcgis-enterprise.
+