Make sure chef mysql configuration overrides defaults

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

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 30ee757aa78f78a35b9a3baad39372aef6a5bb17..788e9551387b8420b72b39f2ed63dfe89c959d4e 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -20,7 +20,7 @@
 
 require "yaml"
 
 
 require "yaml"
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 apache_module "proxy_http"
 
 
 apache_module "proxy_http"
 


@@ -34,7 +34,7 @@ end
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 execute "unzip-kibana-#{version}" do
 end
 
 execute "unzip-kibana-#{version}" do


@@ -48,24 +48,32 @@ end
 directory "/etc/kibana" do
   owner "root"
   group "root"
 directory "/etc/kibana" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 directory "/var/run/kibana" do
   owner "kibana"
   group "kibana"
 end
 
 directory "/var/run/kibana" do
   owner "kibana"
   group "kibana"

-  mode 0755
+  mode 0o755

 end
 
 directory "/var/log/kibana" do
   owner "kibana"
   group "kibana"
 end
 
 directory "/var/log/kibana" do
   owner "kibana"
   group "kibana"

-  mode 0755
+  mode 0o755
+end
+
+systemd_service "kibana@" do
+  description "Kibana server"
+  after "network.target"
+  user "kibana"
+  exec_start "/opt/kibana-#{version}/bin/kibana -c /etc/kibana/%i.yml"
+  restart "on-failure"

 end
 
 node[:kibana][:sites].each do |name, details|
   file "/etc/kibana/#{name}.yml" do
 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],
                         "port" => details[:port],
                         "host" => "127.0.0.1",
                         "elasticsearch_url" => details[:elasticsearch_url],


@@ -74,24 +82,20 @@ node[:kibana][:sites].each do |name, details|
     ))
     owner "root"
     group "root"
     ))
     owner "root"
     group "root"

-    mode 0644
-    notifies :restart, "service[kibana-#{name}]"
-  end
-
-  template "/etc/init/kibana-#{name}.conf" do
-    source "kibana.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    variables :config => "/etc/kibana/#{name}.yml"
-    notifies :restart, "service[kibana-#{name}]"
+    mode 0o644
+    notifies :restart, "service[kibana@#{name}]"

   end
 
   end
 

-  service "kibana-#{name}" do
+  service "kibana@#{name}" do

     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
   end
 
     action [:enable, :start]
     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")
   apache_site details[:site] do
     template "apache.erb"
     variables details.merge(:passwd => "/etc/kibana/#{name}.passwd")