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

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

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index aecdfee86fb13032def3a59cf2a8d61ca53b3e4c..1a8c7712a07eaab254c02343f891158661d3cb2b 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -1,8 +1,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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -19,6 +19,7 @@
 
 require "yaml"
 
 
 require "yaml"
 

+include_recipe "accounts"

 include_recipe "apache"
 
 apache_module "proxy_http"
 include_recipe "apache"
 
 apache_module "proxy_http"


@@ -26,14 +27,14 @@ apache_module "proxy_http"
 version = node[:kibana][:version]
 
 remote_file "#{Chef::Config[:file_cache_path]}/kibana-#{version}.tar.gz" do
 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
 
 execute "unzip-kibana-#{version}" do
 end
 
 execute "unzip-kibana-#{version}" do


@@ -41,25 +42,25 @@ execute "unzip-kibana-#{version}" do
   cwd "/opt/kibana-#{version}"
   user "root"
   group "root"
   cwd "/opt/kibana-#{version}"
   user "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


@@ -83,10 +84,10 @@ 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
 
     notifies :restart, "service[kibana@#{name}]"
   end