X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8df838bf09d95282ba29ddde8b504e0affc5f06e..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/kibana/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb index cc9b7f020..2f2fc6f28 100644 --- a/cookbooks/kibana/recipes/default.rb +++ b/cookbooks/kibana/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: kibana +# Cookbook:: kibana # 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 # -# 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, @@ -19,6 +19,7 @@ require "yaml" +include_recipe "accounts" include_recipe "apache" apache_module "proxy_http" @@ -26,40 +27,41 @@ 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" - mode 0o755 + mode "755" 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" - 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" - mode 0o755 + mode "755" end directory "/var/run/kibana" do owner "kibana" group "kibana" - mode 0o755 + mode "755" end directory "/var/log/kibana" do owner "kibana" group "kibana" - mode 0o755 + mode "755" end systemd_service "kibana@" do @@ -83,10 +85,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" - )) + )) owner "root" group "root" - mode 0o644 + mode "644" notifies :restart, "service[kibana@#{name}]" end