From 8dadc5e2fd31c5e36e1a28410f3dd396be7114dc Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sat, 19 Jun 2021 20:13:50 +0900 Subject: [PATCH 1/4] Change the download URL. --- cookbooks/embulk/install.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cookbooks/embulk/install.rb b/cookbooks/embulk/install.rb index fc8c09b..1ad41b0 100644 --- a/cookbooks/embulk/install.rb +++ b/cookbooks/embulk/install.rb @@ -5,13 +5,11 @@ directory node['embulk']['install_path'] do mode '755' end -URL = "#{node['embulk']['base_binary_url']}#{node['embulk']['version']}#{node['embulk']['extension']}" +URL = "#{node['embulk']['base_binary_url']}#{node['embulk']['version']}/embulk-#{node['embulk']['version']}#{node['embulk']['extension']}" TARGET = "#{node['embulk']['install_path']}/embulk" # Download and install: -execute "wget #{URL} -O #{TARGET}" do - not_if "test -e #{TARGET}" -end +execute "wget #{URL} -O #{TARGET}" file TARGET do owner 'root' From 00813e9f17d773c5de8ebffbc43a19b33d10a64f Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sat, 19 Jun 2021 20:14:07 +0900 Subject: [PATCH 2/4] Overwrite `/usr/local/bin/embulk`. --- cookbooks/embulk/install.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cookbooks/embulk/install.rb b/cookbooks/embulk/install.rb index 1ad41b0..0fb7bcf 100644 --- a/cookbooks/embulk/install.rb +++ b/cookbooks/embulk/install.rb @@ -21,6 +21,8 @@ end link '/usr/local/bin/embulk' do user 'root' to TARGET + + force true end package 'default-jre' do From 8d335a7baec820a603b130c70cd6e2136ad8e4ba Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sat, 19 Jun 2021 20:14:45 +0900 Subject: [PATCH 3/4] temp --- cookbooks/embulk/attributes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/embulk/attributes.rb b/cookbooks/embulk/attributes.rb index c6375ed..1545185 100644 --- a/cookbooks/embulk/attributes.rb +++ b/cookbooks/embulk/attributes.rb @@ -6,7 +6,7 @@ ipaddr = run_command(cmd).stdout.chomp node.reverse_merge!({ 'embulk' => { - 'base_binary_url' => 'https://dl.bintray.com/embulk/maven/embulk-', + 'base_binary_url' => 'https://github.com/embulk/embulk/releases/download/v', 'version' => '0.9.23', 'extension' => '.jar', 'install_path' => '/opt/embulk' From 21f9bb823745c9df80e2392248dc5b7038283701 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sat, 19 Jun 2021 20:16:11 +0900 Subject: [PATCH 4/4] Install plugins for root --- cookbooks/embulk/setup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/embulk/setup.rb b/cookbooks/embulk/setup.rb index 61c3a5d..ad8dd9a 100644 --- a/cookbooks/embulk/setup.rb +++ b/cookbooks/embulk/setup.rb @@ -32,7 +32,7 @@ remote_file '/root/.ssh/config' do end -%w(filter-column output-mysql).each do |p| +%w(filter-column filter-row output-mysql).each do |p| execute "embulk gem install embulk-#{p}" do user 'root'