X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c4726f93edcce48a58904e0952d3a16a757ef42d..bc6624fcc809acaf8dcdcf667e43cc5fc9bb1451:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 0c97546bd..ade13504d 100644
--- 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,
@@ -19,13 +19,16 @@
 
 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 0o644
+  variables :resolvers => resolvers
 end
 
 directory "/var/cache/nginx/fastcgi-cache" do
@@ -47,3 +50,10 @@ service "nginx" do
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
+
+munin_plugin_conf "nginx" do
+  template "munin.erb"
+end
+
+munin_plugin "nginx_request"
+munin_plugin "nginx_status"