diff --git a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_amd64.deb b/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_amd64.deb deleted file mode 100644 index 4c4b9f16..00000000 Binary files a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_amd64.deb and /dev/null differ diff --git a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_arm64.deb b/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_arm64.deb deleted file mode 100644 index 98c2b51d..00000000 Binary files a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_arm64.deb and /dev/null differ diff --git a/base/files/mysql/libevent-core-2.1-6_amd64.deb b/base/files/mysql/libevent-core-2.1-6_amd64.deb deleted file mode 100644 index 6e5c9e8d..00000000 Binary files a/base/files/mysql/libevent-core-2.1-6_amd64.deb and /dev/null differ diff --git a/base/files/mysql/libevent-core-2.1-6_arm64.deb b/base/files/mysql/libevent-core-2.1-6_arm64.deb deleted file mode 100644 index dab47242..00000000 Binary files a/base/files/mysql/libevent-core-2.1-6_arm64.deb and /dev/null differ diff --git a/base/files/mysql/libssl1.1_1.1.1f_amd64.deb b/base/files/mysql/libssl1.1_1.1.1f_amd64.deb deleted file mode 100644 index 34f9f573..00000000 Binary files a/base/files/mysql/libssl1.1_1.1.1f_amd64.deb and /dev/null differ diff --git a/base/files/mysql/libssl1.1_1.1.1f_arm64.deb b/base/files/mysql/libssl1.1_1.1.1f_arm64.deb deleted file mode 100644 index 474e5e9e..00000000 Binary files a/base/files/mysql/libssl1.1_1.1.1f_arm64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-client-5.7.42_amd64.deb b/base/files/mysql/mysql-client-5.7.42_amd64.deb deleted file mode 100644 index 4ce6f570..00000000 Binary files a/base/files/mysql/mysql-client-5.7.42_amd64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-client-5.7.42_arm64.deb b/base/files/mysql/mysql-client-5.7.42_arm64.deb deleted file mode 100644 index 8ffb7688..00000000 Binary files a/base/files/mysql/mysql-client-5.7.42_arm64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-client-core-5.7.42_amd64.deb b/base/files/mysql/mysql-client-core-5.7.42_amd64.deb deleted file mode 100644 index c8a85051..00000000 Binary files a/base/files/mysql/mysql-client-core-5.7.42_amd64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-client-core-5.7.42_arm64.deb b/base/files/mysql/mysql-client-core-5.7.42_arm64.deb deleted file mode 100644 index f8f8ac0d..00000000 Binary files a/base/files/mysql/mysql-client-core-5.7.42_arm64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-server-5.7.42_amd64.deb b/base/files/mysql/mysql-server-5.7.42_amd64.deb deleted file mode 100644 index 1e4d52a9..00000000 Binary files a/base/files/mysql/mysql-server-5.7.42_amd64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-server-5.7.42_arm64.deb b/base/files/mysql/mysql-server-5.7.42_arm64.deb deleted file mode 100644 index 8bf73c1b..00000000 Binary files a/base/files/mysql/mysql-server-5.7.42_arm64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-server-core-5.7.42_amd64.deb b/base/files/mysql/mysql-server-core-5.7.42_amd64.deb deleted file mode 100644 index c4718664..00000000 Binary files a/base/files/mysql/mysql-server-core-5.7.42_amd64.deb and /dev/null differ diff --git a/base/files/mysql/mysql-server-core-5.7.42_arm64.deb b/base/files/mysql/mysql-server-core-5.7.42_arm64.deb deleted file mode 100644 index 09383ddf..00000000 Binary files a/base/files/mysql/mysql-server-core-5.7.42_arm64.deb and /dev/null differ diff --git a/base/recipes/gearman.rb b/base/recipes/gearman.rb index 5914260b..80656a3a 100644 --- a/base/recipes/gearman.rb +++ b/base/recipes/gearman.rb @@ -6,13 +6,14 @@ retries 5 end -cookbook_files = "#{Chef::Config[:file_cache_path]}/cookbooks/#{cookbook_name}/files/gearman" arch = case node["kernel"]["machine"] when "aarch64", "arm64" then "arm64" else "amd64" end +boost_deb = "libboost-program-options1.71.0_1.71.0-6ubuntu6_#{arch}.deb" -execute "dpkg -i #{cookbook_files}/libboost-program-options1.71.0_1.71.0-6ubuntu6_#{arch}.deb;" do +execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/gearman/#{boost_deb} && dpkg -i #{boost_deb};" do + cwd "/tmp" only_if { node["lsb"]["release"].to_i >= 22 } end diff --git a/base/recipes/mysql.rb b/base/recipes/mysql.rb index aa9d00af..0a806982 100644 --- a/base/recipes/mysql.rb +++ b/base/recipes/mysql.rb @@ -35,7 +35,6 @@ action :nothing end -cookbook_files = "#{Chef::Config[:file_cache_path]}/cookbooks/#{cookbook_name}/files/mysql" arch = case node["kernel"]["machine"] when "aarch64", "arm64" then "arm64" else "amd64" @@ -43,12 +42,15 @@ dependencies = node["lsb"]["release"].to_i >= 22 ? ["libevent-core-2.1-6", "libssl1.1_1.1.1f"] : ["libevent-core-2.1-6"] dependencies.each do |pkg| - execute "dpkg -i #{cookbook_files}/#{pkg}_#{arch}.deb;" do + execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/mysql/#{pkg}_#{arch}.deb && dpkg -i #{pkg}_#{arch}.deb" do + cwd "/tmp" not_if "dpkg -S #{pkg} | grep '^#{pkg}'" end end ["mysql-client-core", "mysql-client", "mysql-server-core", "mysql-server"].each do |pkg| - execute "DEBIAN_FRONTEND=noninteractive dpkg -i #{cookbook_files}/#{pkg}-#{node["mysql"]["version"]}_#{arch}.deb || true" do + package = "#{pkg}-#{node["mysql"]["version"]}_#{arch}.deb" + execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/mysql/#{package} && (DEBIAN_FRONTEND=noninteractive dpkg -i #{package} || true)" do + cwd "/tmp" not_if "dpkg -S #{pkg}- | grep '^#{pkg}-#{node["mysql"]["version"].to_i}'" notifies :run, "execute[mysql-configure]", :before if pkg == "mysql-server" notifies :edit, "replace_or_add[mysql-dpkg-configure]", :immediately if pkg == "mysql-server"