Merge pull request #470 from qld-gov-au/github-468-drop-python2

GitHub 468 drop python2
qld-gov-au · Oct 28, 2024 · 2996f68 · 2996f68
2 parents bfc4334 + 80db82f
commit 2996f68
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 139 deletions.
diff --git a/attributes/ckan.rb b/attributes/ckan.rb
@@ -22,11 +22,10 @@
 #
 
 default['datashades']['ckan_web']['endpoint'] = '/'
-default['datashades']['ckan_web']['packages'] = ['xml-commons', 'git', 'libxslt', 'libxslt-devel', 'libxml2', 'libxml2-devel', 'libxslt', 'libxslt-devel', 'gcc', 'gcc-c++', 'make', 'xalan-j2', 'unzip', 'squid']
+default['datashades']['ckan_web']['packages'] = ['xml-commons', 'git', 'libxslt', 'libxslt-devel', 'libxml2', 'libxml2-devel', 'libxslt', 'libxslt-devel', 'gcc', 'gcc-c++', 'make', 'python3-devel', 'xalan-j2', 'unzip', 'squid']
 default['datashades']['ckan_web']['alternative_packages'] = [
     ['postgresql', 'postgresql15'],
     ['postgresql-devel', 'postgresql15-server-devel'],
-    ['python27-devel', 'python3-devel'],
     ['policycoreutils-python', 'policycoreutils-python-utils'],
 ]
 

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -31,11 +31,10 @@
 
 default['datashades']['backup']['retention'] = '30'
 
-default['datashades']['core']['packages'] = ['nfs-utils', 'clamav', 'gcc', 'jq', 'perl-Switch', 'perl-DateTime', 'perl-Sys-Syslog', 'perl-LWP-Protocol-https', 'perl-Digest-SHA.x86_64', 'git', 'telnet', 'cronie']
+default['datashades']['core']['packages'] = ['nfs-utils', 'clamav', 'gcc', 'jq', 'perl-Switch', 'perl-DateTime', 'perl-Sys-Syslog', 'perl-LWP-Protocol-https', 'perl-Digest-SHA.x86_64', 'python3-pip', 'git', 'telnet', 'cronie']
 default['datashades']['core']['alternative_packages'] = [
     ['postfix', 'sendmail'],
     ['yum-cron', 'dnf-automatic'],
-    ['python27-pip', 'python3-pip'],
 ]
 default['datashades']['core']['unwanted-packages'] = ['java-1.7.0-openjdk']
 

diff --git a/recipes/nginx-configure.rb b/recipes/nginx-configure.rb
@@ -30,5 +30,5 @@
 
 service 'nginx' do
 	supports :restart => true, :reload => true, :status => true
-	action [:start, :reload]
+	action [:enable, :start, :reload]
 end
diff --git a/recipes/nginx-setup.rb b/recipes/nginx-setup.rb
@@ -43,9 +43,3 @@
 	EOH
 	not_if { ::File.exist?("/etc/ssl/certs/wild.#{node['datashades']['tld']}.crt") }
 end
-
-# Startup services
-#
-service 'nginx' do
-	action [:enable, :start]
-end
diff --git a/templates/default/installckandbuser.py.erb b/templates/default/installckandbuser.py.erb
diff --git a/templates/default/installdatastore.py.erb b/templates/default/installdatastore.py.erb
diff --git a/templates/default/installpostgis.py.erb b/templates/default/installpostgis.py.erb