imagery: switch to volume mount for imagery

[chef.git] / cookbooks / oxidized / recipes / default.rb

diff --git a/cookbooks/oxidized/recipes/default.rb b/cookbooks/oxidized/recipes/default.rb
index 014955f743c331fe55adad8735ec35721d04785c..66c919908c8b01bf04341256621b5078747f3fec 100644 (file)
--- a/cookbooks/oxidized/recipes/default.rb
+++ b/cookbooks/oxidized/recipes/default.rb
@@ -29,6 +29,7 @@ package %w[
   libssh2-1-dev
   zlib1g-dev
   pkg-config
   libssh2-1-dev
   zlib1g-dev
   pkg-config

+  libyaml-dev

 ]
 
 keys = data_bag_item("oxidized", "keys")
 ]
 
 keys = data_bag_item("oxidized", "keys")


@@ -75,7 +76,7 @@ git "/opt/oxidized/daemon" do
   depth 1
   user "oxidized"
   group "oxidized"
   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
 end
 
 directory "/opt/oxidized/.ssh" do


@@ -85,39 +86,35 @@ directory "/opt/oxidized/.ssh" do
 end
 
 # Key is set as a deployment key in github repo
 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"
   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
   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
 
   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"
   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
   notifies :restart, "service[oxidized]"
 end
 
 ssh_known_hosts_entry "github.com" do

+  action [:create, :flush]

   file_location "/opt/oxidized/.ssh/known_hosts"
   owner "oxidized"
   group "oxidized"
 end
 
   file_location "/opt/oxidized/.ssh/known_hosts"
   owner "oxidized"
   group "oxidized"
 end
 

-ssh_known_hosts_entry "github.com_flush" do
-  action :flush
-  file_location "/opt/oxidized/.ssh/known_hosts"
-end
-

 directory "/var/lib/oxidized" do
   owner "oxidized"
   group "oxidized"
 directory "/var/lib/oxidized" do
   owner "oxidized"
   group "oxidized"


@@ -151,11 +148,8 @@ systemd_service "oxidized" do
   environment "OXIDIZED_HOME" => "/etc/oxidized",
               "OXIDIZED_LOGS" => "/var/log/oxidized"
   nice 10
   environment "OXIDIZED_HOME" => "/etc/oxidized",
               "OXIDIZED_LOGS" => "/var/log/oxidized"
   nice 10

-  private_tmp true
-  private_devices true
-  protect_system "full"
-  protect_home true
-  no_new_privileges true
+  sandbox :enable_network => true
+  read_write_paths ["/run/oxidized", "/var/lib/oxidized", "/var/log/oxidized"]

   restart "on-failure"
   notifies :restart, "service[oxidized]"
 end
   restart "on-failure"
   notifies :restart, "service[oxidized]"
 end