From acf307128e31dc8a207614408b2599baef0f2713 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 3 Nov 2020 13:16:31 -0800 Subject: [PATCH] Release v3.6.1 --- cookbooks/arcgis-desktop/CHANGELOG.md | 4 +++ cookbooks/arcgis-desktop/metadata.rb | 3 +- cookbooks/arcgis-egdb/metadata.rb | 2 +- cookbooks/arcgis-enterprise/CHANGELOG.md | 4 +++ cookbooks/arcgis-enterprise/README.md | 6 +++- .../attributes/datasources.rb | 4 ++- .../libraries/server_admin_client.rb | 17 ++++++++++ cookbooks/arcgis-enterprise/metadata.rb | 5 +-- .../arcgis-enterprise/providers/server.rb | 33 +++++++++++++++++++ .../recipes/install_portal_wa.rb | 2 +- .../recipes/unregister_machines.rb | 29 ++++++++++++++++ .../arcgis-enterprise/resources/server.rb | 3 +- cookbooks/arcgis-geoevent/CHANGELOG.md | 4 +++ cookbooks/arcgis-geoevent/metadata.rb | 4 +-- cookbooks/arcgis-insights/CHANGELOG.md | 4 +++ cookbooks/arcgis-insights/README.md | 11 +++++-- .../arcgis-insights/attributes/default.rb | 22 ++++++++++++- cookbooks/arcgis-insights/metadata.rb | 3 +- .../arcgis-insights/providers/insights.rb | 25 ++++++++++++-- cookbooks/arcgis-insights/recipes/default.rb | 17 ++++++++-- .../arcgis-insights/recipes/uninstall.rb | 28 +++++++++++++--- cookbooks/arcgis-mission/CHANGELOG.md | 3 ++ cookbooks/arcgis-mission/metadata.rb | 4 +-- cookbooks/arcgis-notebooks/README.md | 2 +- cookbooks/arcgis-notebooks/metadata.rb | 4 +-- cookbooks/arcgis-pro/CHANGELOG.md | 4 +++ cookbooks/arcgis-pro/metadata.rb | 3 +- cookbooks/arcgis-repository/CHANGELOG.md | 4 +++ cookbooks/arcgis-repository/README.md | 5 ++- cookbooks/arcgis-repository/metadata.rb | 4 +-- cookbooks/arcgis/CHANGELOG.md | 5 +++ cookbooks/arcgis/metadata.rb | 4 +-- ...arcgis-enterprise-windows-file-server.json | 4 +-- ...rcgis-enterprise-windows-ha-secondary.json | 2 +- .../10.8.1/ubuntu/mission-server-primary.json | 2 +- .../windows/mission-server-primary.json | 2 +- .../10.8/ubuntu/mission-server-primary.json | 2 +- .../10.8/windows/mission-server-primary.json | 2 +- .../10.7.1/ubuntu/notebook-server-node.json | 2 +- .../ubuntu/notebook-server-primary.json | 2 +- .../10.8.1/ubuntu/notebook-server-node.json | 2 +- .../ubuntu/notebook-server-primary.json | 2 +- .../10.8/ubuntu/notebook-server-node.json | 2 +- .../10.8/ubuntu/notebook-server-primary.json | 2 +- 44 files changed, 248 insertions(+), 50 deletions(-) create mode 100644 cookbooks/arcgis-enterprise/recipes/unregister_machines.rb diff --git a/cookbooks/arcgis-desktop/CHANGELOG.md b/cookbooks/arcgis-desktop/CHANGELOG.md index 72af9ac..71282c3 100644 --- a/cookbooks/arcgis-desktop/CHANGELOG.md +++ b/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.6.1 +----- +- Added support for Chef Client 15. + 3.6.0 ----- - Added support for ArcGIS Desktop 10.8.1 and ArcGIS License Manager 2020.0. diff --git a/cookbooks/arcgis-desktop/metadata.rb b/cookbooks/arcgis-desktop/metadata.rb index ea8656b..d4c41a3 100644 --- a/cookbooks/arcgis-desktop/metadata.rb +++ b/cookbooks/arcgis-desktop/metadata.rb @@ -4,7 +4,8 @@ license 'Apache 2.0' description 'Installs and configures ArcGIS Desktop and ArcGIS License Manager' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-repository', '~> 3.6' depends 'windows', '~> 5.3' diff --git a/cookbooks/arcgis-egdb/metadata.rb b/cookbooks/arcgis-egdb/metadata.rb index 4611dbd..b22c9cc 100644 --- a/cookbooks/arcgis-egdb/metadata.rb +++ b/cookbooks/arcgis-egdb/metadata.rb @@ -5,7 +5,7 @@ description 'Creates enterprise geodatabases in SQL Server or PostgreSQL DBMS and registers them with ArcGIS Server.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '1.0.1' -chef_version '>= 12.6', '< 15.0' if defined? chef_version +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-enterprise', '~> 3.4' diff --git a/cookbooks/arcgis-enterprise/CHANGELOG.md b/cookbooks/arcgis-enterprise/CHANGELOG.md index 26b2504..6d3b3d2 100644 --- a/cookbooks/arcgis-enterprise/CHANGELOG.md +++ b/cookbooks/arcgis-enterprise/CHANGELOG.md @@ -3,6 +3,10 @@ arcgis-enterprise cookbook CHANGELOG This file is used to list changes made in each version of the arcgis-enterprise cookbook. +3.6.1 +----- +- Added support for Chef Client 15. + 3.6.0 ----- - Added support for ArcGIS Enterprise 10.8.1. diff --git a/cookbooks/arcgis-enterprise/README.md b/cookbooks/arcgis-enterprise/README.md index 26e3b37..72a083a 100644 --- a/cookbooks/arcgis-enterprise/README.md +++ b/cookbooks/arcgis-enterprise/README.md @@ -363,7 +363,11 @@ Uninstalls ArcGIS Server, Portal for ArcGIS, ArcGIS Data Store, and ArcGIS Web A ### arcgis-enterprise::unregister_machine -Unregisters server machine from the ArcGIS Server site. +Unregisters the local server machine from the ArcGIS Server site. + +### arcgis-enterprise::unregister_machines + +Unregisters from the ArcGIS Server site all the server machines except for the local. ### arcgis-enterprise::unregister_stopped_machines diff --git a/cookbooks/arcgis-enterprise/attributes/datasources.rb b/cookbooks/arcgis-enterprise/attributes/datasources.rb index 22c3f03..a2f2a49 100644 --- a/cookbooks/arcgis-enterprise/attributes/datasources.rb +++ b/cookbooks/arcgis-enterprise/attributes/datasources.rb @@ -26,4 +26,6 @@ default['arcgis']['datasources'].tap do |datasource| datasource['block_data_copy'] = false datasource['ags_connection_file'] = File.join(node['arcgis']['misc']['scripts_dir'], 'AdminConnection.ags') -end \ No newline at end of file + datasource['sde_files']['files'] = {} + datasource['server_config_url'] = "https://#{node['fqdn']}:6443/arcgis" +end diff --git a/cookbooks/arcgis-enterprise/libraries/server_admin_client.rb b/cookbooks/arcgis-enterprise/libraries/server_admin_client.rb index a92ccad..3f49525 100644 --- a/cookbooks/arcgis-enterprise/libraries/server_admin_client.rb +++ b/cookbooks/arcgis-enterprise/libraries/server_admin_client.rb @@ -805,6 +805,23 @@ def assign_privileges(rolename, privilege) validate_response(response) end + def machines + request = Net::HTTP::Post.new(URI.parse(@server_url + + "/admin/machines").request_uri) + + request.add_field('Referer', 'referer') + + token = generate_token() + + request.set_form_data('token' => token, 'f' => 'json') + + response = send_request(request, @server_url) + + validate_response(response) + + JSON.parse(response.body)['machines'] + end + # TODO: Support setting webServerMaxHeapSize, appServerMaxHeapSize, and # other machine properties here. def set_machine_properties(machine_name, soc_max_heap_size) diff --git a/cookbooks/arcgis-enterprise/metadata.rb b/cookbooks/arcgis-enterprise/metadata.rb index e0b610e..1d3b26f 100644 --- a/cookbooks/arcgis-enterprise/metadata.rb +++ b/cookbooks/arcgis-enterprise/metadata.rb @@ -4,8 +4,8 @@ license 'Apache 2.0' description 'Installs and configures ArcGIS Enterprise' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' -chef_version '>= 13.0', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-repository', '~> 3.6' depends 'hostsfile', '~> 3.0' @@ -56,6 +56,7 @@ recipe 'arcgis-enterprise::stop_machine', 'Stops server machine in the ArcGIS Server site' recipe 'arcgis-enterprise::system', 'System requirements' recipe 'arcgis-enterprise::unregister_machine', 'Unregisters server machine from the ArcGIS Server site' +recipe 'arcgis-enterprise::unregister_machines', 'Unregisters from the ArcGIS Server site all the server machines except for the local machine' recipe 'arcgis-enterprise::unregister_stopped_machines', 'Unregisters all unavailable server machines in \'default\' cluster from the ArcGIS Server site' recipe 'arcgis-enterprise::unregister_server_wa', 'Unregisters all ArcGIS Server Web Adaptors' recipe 'arcgis-enterprise::webstyles', 'Installs Portal for ArcGIS Web Styles' diff --git a/cookbooks/arcgis-enterprise/providers/server.rb b/cookbooks/arcgis-enterprise/providers/server.rb index 751e03e..d51de2b 100644 --- a/cookbooks/arcgis-enterprise/providers/server.rb +++ b/cookbooks/arcgis-enterprise/providers/server.rb @@ -830,6 +830,39 @@ end end +action :unregister_machines do + begin + if @new_resource.use_join_site_tool + token = generate_admin_token(@new_resource.install_dir, 5) + + admin_client = ArcGIS::ServerAdminClient.new(@new_resource.server_url, + nil, nil, token) + else + admin_client = ArcGIS::ServerAdminClient.new(@new_resource.server_url, + @new_resource.username, + @new_resource.password) + end + + admin_client.wait_until_available + + Chef::Log.info('Unregistering all server machines except the local machine...') + + machines = admin_client.machines + local_machine_name = admin_client.local_machine_name + + machines.each do |machine| + if machine['machineName'] != local_machine_name + admin_client.unregister_machine(machine['machineName']) + end + end + + new_resource.updated_by_last_action(true) + rescue Exception => e + Chef::Log.error "Failed to unregister server machines. " + e.message + raise e + end +end + action :block_data_copy do begin admin_client = ArcGIS::ServerAdminClient.new(@new_resource.server_url, diff --git a/cookbooks/arcgis-enterprise/recipes/install_portal_wa.rb b/cookbooks/arcgis-enterprise/recipes/install_portal_wa.rb index a946d16..ee40418 100644 --- a/cookbooks/arcgis-enterprise/recipes/install_portal_wa.rb +++ b/cookbooks/arcgis-enterprise/recipes/install_portal_wa.rb @@ -24,7 +24,7 @@ only_if { ::File.exist?(node['arcgis']['web_adaptor']['setup_archive']) && !::File.exist?(node['arcgis']['web_adaptor']['setup']) } if node['platform'] == 'windows' - not_if { !Utils.wa_product_code(node['arcgis']['server']['wa_name'], + not_if { !Utils.wa_product_code(node['arcgis']['portal']['wa_name'], [node['arcgis']['web_adaptor']['product_code'], node['arcgis']['web_adaptor']['product_code2']]).nil? } else diff --git a/cookbooks/arcgis-enterprise/recipes/unregister_machines.rb b/cookbooks/arcgis-enterprise/recipes/unregister_machines.rb new file mode 100644 index 0000000..cbd33a1 --- /dev/null +++ b/cookbooks/arcgis-enterprise/recipes/unregister_machines.rb @@ -0,0 +1,29 @@ +# +# Cookbook Name:: arcgis-enterprise +# Recipe:: unregister_machines +# +# Copyright 2020 Esri +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +arcgis_enterprise_server 'Unregister server machines' do + use_join_site_tool node['arcgis']['server']['use_join_site_tool'] + server_url node['arcgis']['server']['url'] + install_dir node['arcgis']['server']['install_dir'] + username node['arcgis']['server']['admin_username'] + password node['arcgis']['server']['admin_password'] + retries 5 + retry_delay 30 + action :unregister_machines +end diff --git a/cookbooks/arcgis-enterprise/resources/server.rb b/cookbooks/arcgis-enterprise/resources/server.rb index ea3f89f..8a068b4 100644 --- a/cookbooks/arcgis-enterprise/resources/server.rb +++ b/cookbooks/arcgis-enterprise/resources/server.rb @@ -21,7 +21,8 @@ :configure_autostart, :authorize, :create_site, :join_site, :join_cluster, :configure_https, :register_database, :federate, :set_identity_store, :assign_privileges, :set_machine_properties, - :stop_machine, :unregister_machine, :unregister_stopped_machines, :block_data_copy, + :stop_machine, :unregister_machine, :unregister_machines, + :unregister_stopped_machines, :block_data_copy, :configure_security_protocol, :unregister_web_adaptors attribute :setup_archive, :kind_of => String diff --git a/cookbooks/arcgis-geoevent/CHANGELOG.md b/cookbooks/arcgis-geoevent/CHANGELOG.md index afc6a74..01d9803 100644 --- a/cookbooks/arcgis-geoevent/CHANGELOG.md +++ b/cookbooks/arcgis-geoevent/CHANGELOG.md @@ -3,6 +3,10 @@ arcgis-geoevent cookbook CHANGELOG This file is used to list changes made in each version of the arcgis-geoevent cookbook. +3.6.1 +----- +- Added support for Chef Client 15. + 3.6.0 ----- - Added support for ArcGIS GeoEvent Server 10.8.1. diff --git a/cookbooks/arcgis-geoevent/metadata.rb b/cookbooks/arcgis-geoevent/metadata.rb index b2a9635..d9bfb97 100644 --- a/cookbooks/arcgis-geoevent/metadata.rb +++ b/cookbooks/arcgis-geoevent/metadata.rb @@ -4,8 +4,8 @@ license 'Apache 2.0' description 'Installs and configures ArcGIS GeoEvent Server' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' -chef_version '>= 13.0', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-enterprise', '~> 3.6' depends 'arcgis-repository', '~> 3.6' diff --git a/cookbooks/arcgis-insights/CHANGELOG.md b/cookbooks/arcgis-insights/CHANGELOG.md index 47d28bd..46b7c6e 100644 --- a/cookbooks/arcgis-insights/CHANGELOG.md +++ b/cookbooks/arcgis-insights/CHANGELOG.md @@ -2,6 +2,10 @@ This file is used to list changes made in each version of the arcgis-insights cookbook. +## 3.6.1 +- Added support for Chef Client 15. +- Added support for ArcGIS Insights 2020.2/2020.3. + ## 3.6.0 - Added support for Insights for ArcGIS 3.4/3.4.1/2020.1 diff --git a/cookbooks/arcgis-insights/README.md b/cookbooks/arcgis-insights/README.md index a55c240..46b3833 100644 --- a/cookbooks/arcgis-insights/README.md +++ b/cookbooks/arcgis-insights/README.md @@ -20,6 +20,8 @@ Requirements * 3.4 * 3.4.1 * 2020.1 +* 2020.2 +* 2020.3 ### Platforms @@ -31,6 +33,7 @@ Requirements * Rhel 6.5, 7.0 ### Dependencies + The following cookbooks are required: * arcgis-enterprise @@ -39,9 +42,9 @@ The following cookbooks are required: Attributes ---------- -* `node['arcgis']['insights']['version']` = Insights for ArcGIS version. Default version is `3.4.1` -* `node['arcgis']['insights']['setup_archive']` = Path to Insights for ArcGIS version setup archive. Default value depends on `node['arcgis']['pro']['version']` attribute value. -* `node['arcgis']['insights']['setup']` = The location of Insights for ArcGIS setup executable. Default location is `%USERPROFILE%\Documents\Insights \Insights\setup.exe` on Windows and `/opt/arcgis/Insights/Insights-Setup.sh` on Linux. +* `node['arcgis']['insights']['version']` = Insights for ArcGIS version. Default version is `2020.3` +* `node['arcgis']['insights']['setup_archive']` = Path to Insights for ArcGIS version setup archive. Default value depends on `node['arcgis']['insights']['version']` attribute value. +* `node['arcgis']['insights']['setup']` = The location of Insights for ArcGIS setup executable. Default location is `%USERPROFILE%\Documents\ArcGIS Insights \Insights\setup.exe` on Windows and `/opt/arcgis/Insights/Insights-Setup.sh` on Linux. * `node['arcgis']['insights']['setup_archive']` = Path to Insights for ArcGIS setup archive. Default value depends on `node['arcgis']['insights']['version']` attribute value. @@ -49,9 +52,11 @@ Recipes ------- ### arcgis-insights::default + Installs and configures Insights for ArcGIS. ### arcgis-insights::uninstall + Uninstalls Insights for ArcGIS. Usage diff --git a/cookbooks/arcgis-insights/attributes/default.rb b/cookbooks/arcgis-insights/attributes/default.rb index cd9ea8e..959ae94 100644 --- a/cookbooks/arcgis-insights/attributes/default.rb +++ b/cookbooks/arcgis-insights/attributes/default.rb @@ -20,7 +20,7 @@ include_attribute 'arcgis-enterprise' default['arcgis']['insights'].tap do |insights| - insights['version'] = '2020.1' + insights['version'] = '2020.3' case node['platform'] when 'windows' @@ -28,10 +28,24 @@ node['arcgis']['insights']['version'] + '\\Insights\\Setup.exe' case node['arcgis']['insights']['version'] + when '2020.3' + insights['product_code'] = '{A423A99B-D785-49F9-B91B-E39457B6B6D5}' + insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], + 'ArcGIS_Insights_Windows_2020_3_176134.exe') + insights['setup'] = node['arcgis']['repository']['setups'] + '\\ArcGIS Insights Windows ' + + node['arcgis']['insights']['version'] + '\\Insights\\Setup.exe' + when '2020.2' + insights['product_code'] = '{A51F92FD-3A9D-467C-B29F-74759CB85E0A}' + insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], + 'ArcGIS_Insights_Windows_2020_2_175863.exe') + insights['setup'] = node['arcgis']['repository']['setups'] + '\\ArcGIS Insights ' + + node['arcgis']['insights']['version'] + '\\Insights\\Setup.exe' when '2020.1' insights['product_code'] = '{5293D733-7F85-48C8-90A2-7506E51773DB}' insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], 'ArcGIS_Insights_Windows_2020_1_173526.exe') + insights['setup'] = node['arcgis']['repository']['setups'] + '\\ArcGIS Insights ' + + node['arcgis']['insights']['version'] + '\\Insights\\Setup.exe' when '3.4.1' insights['product_code'] = '{F3B91D92-3DD8-4F0B-B43B-6F9DA2C1830A}' insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], @@ -89,6 +103,12 @@ 'Insights/Insights-Setup.sh') case node['arcgis']['insights']['version'] + when '2020.3' + insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], + 'ArcGIS_Insights_Linux_2020_3_176135.tar.gz') + when '2020.2' + insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], + 'ArcGIS_Insights_Linux_2020_2_175864.tar.gz') when '2020.1' insights['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'], 'ArcGIS_Insights_Linux_2020_1_173527.tar.gz') diff --git a/cookbooks/arcgis-insights/metadata.rb b/cookbooks/arcgis-insights/metadata.rb index 633db87..83d0843 100644 --- a/cookbooks/arcgis-insights/metadata.rb +++ b/cookbooks/arcgis-insights/metadata.rb @@ -4,7 +4,8 @@ license 'Apache 2.0' description 'Installs and configures Insights for ArcGIS' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-enterprise', '~> 3.6' depends 'arcgis-repository', '~> 3.6' diff --git a/cookbooks/arcgis-insights/providers/insights.rb b/cookbooks/arcgis-insights/providers/insights.rb index 91598fe..3845d7a 100644 --- a/cookbooks/arcgis-insights/providers/insights.rb +++ b/cookbooks/arcgis-insights/providers/insights.rb @@ -2,7 +2,7 @@ # Cookbook Name:: arcgis-insights # Provider:: insights # -# Copyright 2017 Esri +# Copyright 2020 Esri # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,6 +61,17 @@ { :timeout => 3600 }) cmd.run_command cmd.error! + + # Stop Portal to start it later using SystemD service + cmd = node['arcgis']['portal']['stop_tool'] + + if node['arcgis']['run_as_superuser'] + cmd = Mixlib::ShellOut.new("su #{node['arcgis']['run_as_user']} -c \"#{cmd}\"", {:timeout => 30}) + else + cmd = Mixlib::ShellOut.new(cmd, {:timeout => 30}) + end + cmd.run_command + cmd.error! end new_resource.updated_by_last_action(true) @@ -98,8 +109,18 @@ cmd.run_command cmd.error! end + + # Stop Portal to start it later using SystemD service + cmd = node['arcgis']['portal']['stop_tool'] + + if node['arcgis']['run_as_superuser'] + cmd = Mixlib::ShellOut.new("su #{node['arcgis']['run_as_user']} -c \"#{cmd}\"", {:timeout => 30}) + else + cmd = Mixlib::ShellOut.new(cmd, {:timeout => 30}) + end + cmd.run_command + cmd.error! end new_resource.updated_by_last_action(true) end - diff --git a/cookbooks/arcgis-insights/recipes/default.rb b/cookbooks/arcgis-insights/recipes/default.rb index ce7fd53..f335cf8 100644 --- a/cookbooks/arcgis-insights/recipes/default.rb +++ b/cookbooks/arcgis-insights/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -arcgis_insights_insights 'Unpack Insights for ArcGIS' do +arcgis_insights_insights 'Unpack ArcGIS Insights' do setup_archive node['arcgis']['insights']['setup_archive'] setups_repo node['arcgis']['repository']['setups'] run_as_user node['arcgis']['run_as_user'] @@ -36,7 +36,7 @@ action :unpack end -arcgis_insights_insights 'Setup Insights for ArcGIS' do +arcgis_insights_insights 'Install ArcGIS Insights' do setup node['arcgis']['insights']['setup'] run_as_user node['arcgis']['run_as_user'] if node['platform'] == 'windows' @@ -51,3 +51,16 @@ end action :install end + +arcgis_enterprise_portal 'Start Portal for ArcGIS after ArcGIS Insights install' do + tomcat_java_opts node['arcgis']['portal']['tomcat_java_opts'] + if node['platform'] == 'windows' + only_if { Utils.product_installed?(node['arcgis']['portal']['product_code']) } + else + only_if { EsriProperties.product_installed?(node['arcgis']['run_as_user'], + node['hostname'], + node['arcgis']['version'], + :ArcGISPortal) } + end + action :start +end diff --git a/cookbooks/arcgis-insights/recipes/uninstall.rb b/cookbooks/arcgis-insights/recipes/uninstall.rb index c6dfddb..0f7c90f 100644 --- a/cookbooks/arcgis-insights/recipes/uninstall.rb +++ b/cookbooks/arcgis-insights/recipes/uninstall.rb @@ -2,7 +2,7 @@ # Cookbook Name:: arcgis-insights # Recipe:: uninstall # -# Copyright 2017 Esri +# Copyright 2020 Esri # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,15 +17,33 @@ # limitations under the License. # -arcgis_insights_insights 'Uninstall Insights for ArcGIS' do +arcgis_insights_insights 'Uninstall ArcGIS Insights' do product_code node['arcgis']['insights']['product_code'] run_as_user node['arcgis']['run_as_user'] if node['platform'] == 'windows' only_if { Utils.product_installed?(node['arcgis']['insights']['product_code']) } else - only_if { ::File.exists?(::File.join(node['arcgis']['server']['install_dir'], - node['arcgis']['server']['install_subdir'], - 'GeoEvent/bin/ArcGISGeoEvent-service')) } + only_if { EsriProperties.product_installed?(node['arcgis']['run_as_user'], + node['hostname'], + node['arcgis']['version'], + :ArcGISPortal_Insights) || + EsriProperties.product_installed?(node['arcgis']['run_as_user'], + node['hostname'], + node['arcgis']['version'], + :ArcGISServer_Insights) } end action :uninstall end + +arcgis_enterprise_portal 'Start Portal for ArcGIS after ArcGIS Insights uninstall' do + tomcat_java_opts node['arcgis']['portal']['tomcat_java_opts'] + if node['platform'] == 'windows' + only_if { Utils.product_installed?(node['arcgis']['portal']['product_code']) } + else + only_if { EsriProperties.product_installed?(node['arcgis']['run_as_user'], + node['hostname'], + node['arcgis']['version'], + :ArcGISPortal) } + end + action :start +end diff --git a/cookbooks/arcgis-mission/CHANGELOG.md b/cookbooks/arcgis-mission/CHANGELOG.md index 14954d9..bcca8d7 100644 --- a/cookbooks/arcgis-mission/CHANGELOG.md +++ b/cookbooks/arcgis-mission/CHANGELOG.md @@ -2,6 +2,9 @@ This file is used to list changes made in each version of the arcgis-mission cookbook. +# 3.6.1 +- Added support for Chef Client 15. + # 3.6.0 ------- - Initial release of the cookbook. diff --git a/cookbooks/arcgis-mission/metadata.rb b/cookbooks/arcgis-mission/metadata.rb index 3c324cb..a5cacac 100644 --- a/cookbooks/arcgis-mission/metadata.rb +++ b/cookbooks/arcgis-mission/metadata.rb @@ -4,8 +4,8 @@ license 'Apache-2.0' description 'Installs/Configures ArcGIS Mission Server' long_description 'Installs/Configures ArcGIS Mission Server' -version '3.6.0' -chef_version '>= 13.0', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-enterprise', '~> 3.6' depends 'arcgis-repository', '~> 3.6' diff --git a/cookbooks/arcgis-notebooks/README.md b/cookbooks/arcgis-notebooks/README.md index 76c02e2..793c00b 100644 --- a/cookbooks/arcgis-notebooks/README.md +++ b/cookbooks/arcgis-notebooks/README.md @@ -172,7 +172,7 @@ Find a bug or want to request a new feature? Please let us know by submitting a Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing). -## Licensing +Licensing --------- Copyright 2020 Esri diff --git a/cookbooks/arcgis-notebooks/metadata.rb b/cookbooks/arcgis-notebooks/metadata.rb index 563bc4a..c20a1a3 100644 --- a/cookbooks/arcgis-notebooks/metadata.rb +++ b/cookbooks/arcgis-notebooks/metadata.rb @@ -4,8 +4,8 @@ license 'Apache-2.0' description 'Installs/Configures ArcGIS Notebook Server' long_description 'Installs/Configures ArcGIS Notebook Server' -version '3.6.0' -chef_version '>= 13.0', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-enterprise', '~> 3.6' depends 'arcgis-repository', '~> 3.6' diff --git a/cookbooks/arcgis-pro/CHANGELOG.md b/cookbooks/arcgis-pro/CHANGELOG.md index baf9f17..9c361d1 100644 --- a/cookbooks/arcgis-pro/CHANGELOG.md +++ b/cookbooks/arcgis-pro/CHANGELOG.md @@ -3,6 +3,10 @@ arcgis-pro cookbook CHANGELOG This file is used to list changes made in each version of the arcgis-pro cookbook. +3.6.1 +----- +- Added support for Chef Client 15. + 3.6.0 ----- - Added support for ArcGIS Pro 2.6. diff --git a/cookbooks/arcgis-pro/metadata.rb b/cookbooks/arcgis-pro/metadata.rb index e09558e..28965e1 100644 --- a/cookbooks/arcgis-pro/metadata.rb +++ b/cookbooks/arcgis-pro/metadata.rb @@ -4,7 +4,8 @@ license 'Apache 2.0' description 'Installs and configures ArcGIS Pro' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-repository', '~> 3.6' depends 'windows', '~> 5.3' diff --git a/cookbooks/arcgis-repository/CHANGELOG.md b/cookbooks/arcgis-repository/CHANGELOG.md index 7c809d5..f22375c 100644 --- a/cookbooks/arcgis-repository/CHANGELOG.md +++ b/cookbooks/arcgis-repository/CHANGELOG.md @@ -3,6 +3,10 @@ arcgis-repository cookbook CHANGELOG This file is used to list changes made in each version of the arcgis-repository cookbook. +3.6.1 +----- +- Added support for Chef Client 15. + 3.6.0 ----- - Added s3files2 recipe. diff --git a/cookbooks/arcgis-repository/README.md b/cookbooks/arcgis-repository/README.md index f201079..0c808f8 100644 --- a/cookbooks/arcgis-repository/README.md +++ b/cookbooks/arcgis-repository/README.md @@ -121,6 +121,8 @@ arcgis-repository::s3files recipe use example. } ``` +See [wiki](https://github.com/Esri/arcgis-cookbook/wiki) pages for more information about using ArcGIS cookbooks. + ## Issues Find a bug or want to request a new feature? Please let us know by submitting an [issue](https://github.com/Esri/arcgis-cookbook/issues). @@ -146,6 +148,3 @@ See the License for the specific language governing permissions and 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 Language: Ruby) diff --git a/cookbooks/arcgis-repository/metadata.rb b/cookbooks/arcgis-repository/metadata.rb index 713bdef..aadbab8 100644 --- a/cookbooks/arcgis-repository/metadata.rb +++ b/cookbooks/arcgis-repository/metadata.rb @@ -4,8 +4,8 @@ license 'Apache-2.0' description 'Downloads ArcGIS software setups from remote to local repositories' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' -chef_version '>= 13.0', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 's3_file', '~> 2.8' diff --git a/cookbooks/arcgis/CHANGELOG.md b/cookbooks/arcgis/CHANGELOG.md index 4d3b4c4..bf32f2e 100644 --- a/cookbooks/arcgis/CHANGELOG.md +++ b/cookbooks/arcgis/CHANGELOG.md @@ -3,6 +3,11 @@ arcgis cookbook CHANGELOG This file is used to list changes made in each version of the arcgis cookbook. +3.6.1 +----- +- Added support for Chef Client 15. + + 3.6.0 ----- - Added arcgis-mission cookbook. diff --git a/cookbooks/arcgis/metadata.rb b/cookbooks/arcgis/metadata.rb index c1ff9ee..e16e886 100644 --- a/cookbooks/arcgis/metadata.rb +++ b/cookbooks/arcgis/metadata.rb @@ -4,8 +4,8 @@ license 'Apache 2.0' description 'ArcGIS Chef Cookbooks' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '3.6.0' -chef_version '>= 12.6', '< 15.0' if defined? chef_version +version '3.6.1' +chef_version '>= 13.0' if defined? chef_version depends 'arcgis-desktop', '~> 3.6' depends 'arcgis-egdb', '~> 1.0' diff --git a/roles/arcgis-enterprise-windows-file-server.json b/roles/arcgis-enterprise-windows-file-server.json index 8cd97f1..f7f384f 100644 --- a/roles/arcgis-enterprise-windows-file-server.json +++ b/roles/arcgis-enterprise-windows-file-server.json @@ -3,13 +3,13 @@ "run_as_user": "arcgis", "run_as_password": "Pa$$w0rdPa$$w0rd", "fileserver": { - "shares": ["C:\\arcgisserver", "C:\\arcgisdatastore", "C:\\arcgisportal\\content"] + "shares": ["C:\\arcgisserver", "C:\\arcgisdatastore", "C:\\arcgisportal"] }, "server": { "local_directories_root": "C:\\arcgisserver" }, "portal": { - "local_content_dir": "C:\\arcgisportal\\content" + "local_content_dir": "C:\\arcgisportal" }, "data_store": { "local_backup_dir": "C:\\arcgisdatastore\\backup" diff --git a/roles/arcgis-enterprise-windows-ha-secondary.json b/roles/arcgis-enterprise-windows-ha-secondary.json index cffeae2..7569ae6 100644 --- a/roles/arcgis-enterprise-windows-ha-secondary.json +++ b/roles/arcgis-enterprise-windows-ha-secondary.json @@ -16,7 +16,7 @@ "data_store":{ "setup":"C:\\ArcGIS\\10.8.1\\DataStore\\Setup.exe", "data_dir":"C:\\arcgisdatastore\\data", - "backup_dir":"\\\\fileserver\\arcgisdatastore\\ds_backups", + "backup_dir":"\\\\fileserver\\arcgisdatastore\\backup", "types":"relational,tileCache" }, "server":{ diff --git a/templates/arcgis-mission-server/10.8.1/ubuntu/mission-server-primary.json b/templates/arcgis-mission-server/10.8.1/ubuntu/mission-server-primary.json index 0b71a58..2066300 100644 --- a/templates/arcgis-mission-server/10.8.1/ubuntu/mission-server-primary.json +++ b/templates/arcgis-mission-server/10.8.1/ubuntu/mission-server-primary.json @@ -16,7 +16,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1", + "s3bucket": "arcgisstore1081-us-east-1", "region": "us-east-1" }, "files": { diff --git a/templates/arcgis-mission-server/10.8.1/windows/mission-server-primary.json b/templates/arcgis-mission-server/10.8.1/windows/mission-server-primary.json index ab76cc3..f446b15 100644 --- a/templates/arcgis-mission-server/10.8.1/windows/mission-server-primary.json +++ b/templates/arcgis-mission-server/10.8.1/windows/mission-server-primary.json @@ -9,7 +9,7 @@ "local_archives": "C:\\Temp", "setups": "C:\\Temp", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1", + "s3bucket": "arcgisstore1081-us-east-1", "region": "us-east-1" }, "files": { diff --git a/templates/arcgis-mission-server/10.8/ubuntu/mission-server-primary.json b/templates/arcgis-mission-server/10.8/ubuntu/mission-server-primary.json index b27fe9a..fa0ee03 100644 --- a/templates/arcgis-mission-server/10.8/ubuntu/mission-server-primary.json +++ b/templates/arcgis-mission-server/10.8/ubuntu/mission-server-primary.json @@ -16,7 +16,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore108-us-east-1" }, "files": { "ArcGIS_Mission_Server_Linux_108_173013.tar.gz": { diff --git a/templates/arcgis-mission-server/10.8/windows/mission-server-primary.json b/templates/arcgis-mission-server/10.8/windows/mission-server-primary.json index 60f8a00..534477c 100644 --- a/templates/arcgis-mission-server/10.8/windows/mission-server-primary.json +++ b/templates/arcgis-mission-server/10.8/windows/mission-server-primary.json @@ -9,7 +9,7 @@ "local_archives": "C:\\Temp", "setups": "C:\\Temp", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore108-us-east-1" }, "files": { "ArcGIS_Mission_Server_Windows_108_172945.exe": { diff --git a/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-node.json b/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-node.json index 71bea9b..406537c 100644 --- a/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-node.json +++ b/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-node.json @@ -8,7 +8,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore1071-us-east-1" }, "files": { "ArcGIS_Notebook_Docker_Advanced_1071_169738.tar.gz": { diff --git a/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-primary.json b/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-primary.json index 3763eab..47cfa3d 100644 --- a/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-primary.json +++ b/templates/arcgis-notebook-server/10.7.1/ubuntu/notebook-server-primary.json @@ -19,7 +19,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore1071-us-east-1" }, "files": { "ArcGIS_Notebook_Docker_Advanced_1071_169738.tar.gz": { diff --git a/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-node.json b/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-node.json index 94e58bd..5a549cf 100644 --- a/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-node.json +++ b/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-node.json @@ -8,7 +8,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1", + "s3bucket": "arcgisstore1081-us-east-1", "region": "us-east-1" }, "files": { diff --git a/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-primary.json b/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-primary.json index 68e3488..cf8775d 100644 --- a/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-primary.json +++ b/templates/arcgis-notebook-server/10.8.1/ubuntu/notebook-server-primary.json @@ -19,7 +19,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1", + "s3bucket": "arcgisstore1081-us-east-1", "region": "us-east-1" }, "files": { diff --git a/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-node.json b/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-node.json index 74ca3fc..9fea539 100644 --- a/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-node.json +++ b/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-node.json @@ -8,7 +8,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore108-us-east-1" }, "files": { "ArcGIS_Notebook_Docker_Advanced_108_172943.tar.gz": { diff --git a/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-primary.json b/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-primary.json index 073ee5b..81f3a93 100644 --- a/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-primary.json +++ b/templates/arcgis-notebook-server/10.8/ubuntu/notebook-server-primary.json @@ -19,7 +19,7 @@ "repository": { "local_archives": "/opt/software/esri", "server": { - "s3bucket": "arcgisdaily-repo-us-east-1" + "s3bucket": "arcgisstore108-us-east-1" }, "files": { "ArcGIS_Notebook_Docker_Advanced_108_172943.tar.gz": {