Make nginx cookbook default to using the nginx upstream repository

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 54a9b7524b0953096754921167cdd845115f7352..94754546c257168b12a16a807d560a3066e21058 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: nginx
+# Cookbook:: nginx
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, 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,
@@ -17,35 +17,50 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+include_recipe "munin"
+
 package "nginx"
 
-# admins = data_bag_item("nginx", "admins")
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
+end
 
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
+  variables :resolvers => resolvers
 end
 
-if node['nginx']['cache']['fastcgi']['enable']
-  directory "/var/cache/nginx/fastcgi-cache" do
-    owner "www-data"
-    group "root"
-    mode 0755
-  end
+directory node[:nginx][:cache][:fastcgi][:directory] do
+  owner "www-data"
+  group "root"
+  mode 0o755
+  recursive true
+  only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
-if node['nginx']['cache']['proxy']['enable']
-  directory "/var/cache/nginx/proxy-cache" do
-    owner "www-data"
-    group "root"
-    mode 0755
-  end
+directory node[:nginx][:cache][:proxy][:directory] do
+  owner "www-data"
+  group "root"
+  mode 0o755
+  recursive true
+  only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
 service "nginx" do
-  action [:enable]
+  action [:enable] # Do not start the service as config may be broken from failed chef run
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
+
+munin_plugin_conf "nginx" do
+  template "munin.erb"
+end
+
+package "libwww-perl"
+
+munin_plugin "nginx_request"
+munin_plugin "nginx_status"