Update CiviCRM to 4.7.31

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

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 160d3233c610b1abeed110ba304484785ebebb58..aecdfee86fb13032def3a59cf2a8d61ca53b3e4c 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -1,4 +1,3 @@
-# coding: utf-8

 #
 # Cookbook Name:: kibana
 # Recipe:: default
 #
 # Cookbook Name:: kibana
 # Recipe:: default


@@ -9,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,7 +19,7 @@
 
 require "yaml"
 
 
 require "yaml"
 

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

 
 apache_module "proxy_http"
 
 
 apache_module "proxy_http"
 


@@ -68,6 +67,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
 


@@ -89,6 +93,12 @@ node[:kibana][:sites].each do |name, details|
   service "kibana@#{name}" do
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => false
   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
+    domains details[:site]
+    notifies :reload, "service[apache2]"

   end
 
   apache_site details[:site] do
   end
 
   apache_site details[:site] do