X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f1f617ac9c5d317239a1b770e25216ea3efda2e7..c4817c654797638bf16b54f4f9b69ed3715625cb:/cookbooks/kibana/recipes/default.rb

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 44ffb2983..788e95513 100644
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -20,7 +20,7 @@
 
 require "yaml"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 apache_module "proxy_http"
 
@@ -34,7 +34,7 @@ end
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 execute "unzip-kibana-#{version}" do
@@ -48,19 +48,19 @@ end
 directory "/etc/kibana" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/run/kibana" do
   owner "kibana"
   group "kibana"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/log/kibana" do
   owner "kibana"
   group "kibana"
-  mode 0755
+  mode 0o755
 end
 
 systemd_service "kibana@" do
@@ -73,7 +73,7 @@ end
 
 node[:kibana][:sites].each do |name, details|
   file "/etc/kibana/#{name}.yml" do
-    content YAML.dump(YAML.load(File.read("/opt/kibana-#{version}/config/kibana.yml")).merge(
+    content YAML.dump(YAML.safe_load(File.read("/opt/kibana-#{version}/config/kibana.yml")).merge(
                         "port" => details[:port],
                         "host" => "127.0.0.1",
                         "elasticsearch_url" => details[:elasticsearch_url],
@@ -82,7 +82,7 @@ node[:kibana][:sites].each do |name, details|
     ))
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[kibana@#{name}]"
   end
 
@@ -91,6 +91,11 @@ node[:kibana][:sites].each do |name, details|
     supports :status => true, :restart => true, :reload => false
   end
 
+  ssl_certificate details[:site] do
+    domains details[:site]
+    notifies :reload, "service[apache2]"
+  end
+
   apache_site details[:site] do
     template "apache.erb"
     variables details.merge(:passwd => "/etc/kibana/#{name}.passwd")