Merge remote-tracking branch 'github/pull/713'

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

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 6a985ae344a12bd46ee7634ace62891521100e47..2f2fc6f28a4f7495c4b47c551ae15aea66029d8b 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -1,15 +1,14 @@
-# coding: utf-8

 #
 #

-# Cookbook Name:: kibana
+# Cookbook:: kibana

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,47 +19,49 @@
 
 require "yaml"
 
 
 require "yaml"
 

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

 
 apache_module "proxy_http"
 
 version = node[:kibana][:version]
 
 remote_file "#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz" do
 
 apache_module "proxy_http"
 
 version = node[:kibana][:version]
 
 remote_file "#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz" do

-  source "https://download.elastic.co/kibana/kibana/kibana-4.1.1-linux-x64.tar.gz"
-  not_if { File.exist?("/opt/kibana-#{version}/bin/kibana") }
+  source "https://download.elastic.co/kibana/kibana/kibana-#{version}-linux-x64.tar.gz"
+  not_if { ::File.exist?("/opt/kibana-#{version}/bin/kibana") }

 end
 
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"
 end
 
 directory "/opt/kibana-#{version}" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-execute "unzip-kibana-#{version}" do
-  command "tar --gunzip --extract --strip-components=1 --file=#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz"
-  cwd "/opt/kibana-#{version}"
-  user "root"
+archive_file "#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz" do
+  destination "/opt/kibana-#{version}"
+  overwrite true
+  strip_components 1
+  owner "root"

   group "root"
   group "root"

-  not_if { File.exist?("/opt/kibana-#{version}/bin/kibana") }
+  not_if { ::File.exist?("/opt/kibana-#{version}/bin/kibana") }

 end
 
 directory "/etc/kibana" do
   owner "root"
   group "root"
 end
 
 directory "/etc/kibana" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

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

-  mode 0o755
+  mode "755"

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

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "kibana@" do
 end
 
 systemd_service "kibana@" do


@@ -68,6 +69,11 @@ systemd_service "kibana@" do
   after "network.target"
   user "kibana"
   exec_start "/opt/kibana-#{version}/bin/kibana -c /etc/kibana/%i.yml"
   after "network.target"
   user "kibana"
   exec_start "/opt/kibana-#{version}/bin/kibana -c /etc/kibana/%i.yml"

+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -79,16 +85,17 @@ node[:kibana][:sites].each do |name, details|
                         "elasticsearch_url" => details[:elasticsearch_url],
                         "pid_file" => "/var/run/kibana/#{name}.pid",
                         "log_file" => "/var/log/kibana/#{name}.log"
                         "elasticsearch_url" => details[:elasticsearch_url],
                         "pid_file" => "/var/run/kibana/#{name}.pid",
                         "log_file" => "/var/log/kibana/#{name}.log"

-    ))
+                      ))

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     notifies :restart, "service[kibana@#{name}]"
   end
 
   service "kibana@#{name}" do
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
     notifies :restart, "service[kibana@#{name}]"
   end
 
   service "kibana@#{name}" do
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false

+    subscribes :restart, "systemd_service[kibana@]"

   end
 
   ssl_certificate details[:site] do
   end
 
   ssl_certificate details[:site] do