Revert "Disable login with facebook"

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index bc0410fd3fb3bb4ef7e5d7e38ee35d44a1bd94a5..4d91da140e061d30389de52992b3edcc801bcf48 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: apache
+# Cookbook:: apache

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

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, 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.


@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "munin"
+include_recipe "prometheus"

 include_recipe "ssl"
 
 package %w[
 include_recipe "ssl"
 
 package %w[


@@ -36,9 +38,7 @@ apache_module "mpm_#{node[:apache][:mpm]}" do
   action [:enable]
 end
 
   action [:enable]
 end
 

-if node[:lsb][:release].to_f >= 18.04
-  apache_module "http2"
-end
+apache_module "http2"

 
 admins = data_bag_item("apache", "admins")
 
 
 admins = data_bag_item("apache", "admins")
 


@@ -51,11 +51,20 @@ template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
   source "ports.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"
+end
+
+systemd_service "apache2" do
+  dropin "chef"
+  memory_high "50%"
+  memory_max "75%"
+  notifies :restart, "service[apache2]"

 end
 
 service "apache2" do
   action [:enable, :start]
 end
 
 service "apache2" do
   action [:enable, :start]

+  retries 2
+  retry_delay 10

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -69,18 +78,12 @@ apache_module "status" do
   variables :hosts => admins["hosts"]
 end
 
   variables :hosts => admins["hosts"]
 end
 

-apache_module "deflate" do
-  conf "deflate.conf.erb"
+apache_module "brotli" do
+  conf "brotli.conf.erb"

 end
 
 end
 

-if node[:apache][:reqtimeout]
-  apache_module "reqtimeout" do
-    action [:enable]
-  end
-else
-  apache_module "reqtimeout" do
-    action [:disable]
-  end
+apache_module "deflate" do
+  conf "deflate.conf.erb"

 end
 
 apache_module "headers"
 end
 
 apache_module "headers"


@@ -93,3 +96,15 @@ end
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"

+
+template "/var/lib/prometheus/node-exporter/apache.prom" do
+  source "apache.prom.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+prometheus_exporter "apache" do
+  port 9117
+  options "--scrape_uri=http://localhost/server-status?auto"
+end