dns: Upgrade dnscontrol to 3.27.1

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index ae6fb2362c71fd7ead8d3a85de1b9debec67fbbc..085428583ef5e540deb4ce738011181ce2ac19ff 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,31 +17,33 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "nginx"
+include_recipe "apt::nginx"
+include_recipe "munin"
+include_recipe "prometheus"
+include_recipe "ssl"

 
 

-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
+package "nginx"

 
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
 
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
-  variables :resolvers => resolvers
+  mode "644"

 end
 
 end
 

-directory "/var/cache/nginx/fastcgi-cache" do
+directory node[:nginx][:cache][:fastcgi][:directory] do

   owner "www-data"
   group "root"
   owner "www-data"
   group "root"

-  mode 0o755
+  mode "755"
+  recursive true

   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 

-directory "/var/cache/nginx/proxy-cache" do
+directory node[:nginx][:cache][:proxy][:directory] do

   owner "www-data"
   group "root"
   owner "www-data"
   group "root"

-  mode 0o755
+  mode "755"
+  recursive true

   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 


@@ -59,3 +61,8 @@ package "libwww-perl"
 
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"
 
 munin_plugin "nginx_request"
 munin_plugin "nginx_status"

+
+prometheus_exporter "nginx" do
+  port 9113
+  options "--nginx.scrape-uri=http://localhost:8050/nginx_status"
+end