X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2b742aa96a7c7e1256ad9a7c8e9ee698130b5226..ec391f0f0c548939d65966446dc815f5f5a51ba6:/cookbooks/kibana/recipes/default.rb?ds=inline

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 30ee757aa..e4dd05c9f 100644
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -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,27 @@ 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
+  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|
@@ -74,20 +82,11 @@ node[:kibana][:sites].each do |name, details|
     ))
     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
 
-  service "kibana-#{name}" do
+  service "kibana@#{name}" do
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
   end