X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/03b4e10a2023b0ddde6b1c5ce66992a773b5d0ee..97baa72d45f054030c0571d02014ce8d3cb37aae:/cookbooks/oxidized/recipes/default.rb

diff --git a/cookbooks/oxidized/recipes/default.rb b/cookbooks/oxidized/recipes/default.rb
index 4b2556989..4d1da0343 100644
--- a/cookbooks/oxidized/recipes/default.rb
+++ b/cookbooks/oxidized/recipes/default.rb
@@ -75,7 +75,7 @@ git "/opt/oxidized/daemon" do
   depth 1
   user "oxidized"
   group "oxidized"
-  notifies :run, "bundle_install[/opt/oxidized/daemon]"
+  notifies :run, "bundle_install[/opt/oxidized/daemon]", :immediately
 end
 
 directory "/opt/oxidized/.ssh" do
@@ -85,30 +85,30 @@ directory "/opt/oxidized/.ssh" do
 end
 
 # Key is set as a deployment key in github repo
-file "/opt/oxidized/.ssh/id_rsa" do
+file "/opt/oxidized/.ssh/id_ed25519" do
   content keys["git"].join("\n")
   owner "oxidized"
   group "oxidized"
   mode "400"
-  notifies :delete, "file[/opt/oxidized/.ssh/id_rsa.pub]", :immediately
+  notifies :delete, "file[/opt/oxidized/.ssh/id_ed25519.pub]", :immediately
   notifies :restart, "service[oxidized]"
 end
 
 # Ensure public key is deleted if private key is changed. Trigged by notify
-file "/opt/oxidized/.ssh/id_rsa.pub" do
+file "/opt/oxidized/.ssh/id_ed25519.pub" do
   action :nothing
 end
 
-execute "/opt/oxidized/.ssh/id_rsa.pub" do
-  command "ssh-keygen -f /opt/oxidized/.ssh/id_rsa -y > /opt/oxidized/.ssh/id_rsa.pub"
+execute "/opt/oxidized/.ssh/id_ed25519.pub" do
+  command "ssh-keygen -f /opt/oxidized/.ssh/id_ed25519 -y > /opt/oxidized/.ssh/id_ed25519.pub"
   user "oxidized"
   group "oxidized"
-  creates "/opt/oxidized/.ssh/id_rsa.pub"
+  creates "/opt/oxidized/.ssh/id_ed25519.pub"
   notifies :restart, "service[oxidized]"
 end
 
 ssh_known_hosts_entry "github.com" do
-  action :flush
+  action [:create, :flush]
   file_location "/opt/oxidized/.ssh/known_hosts"
   owner "oxidized"
   group "oxidized"