X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0d9d62f20b15d6dcffc10acc82cac845f7f5ca76..58368b10fb37cfcd56738324f90942a8fd8e3793:/cookbooks/nginx/recipes/default.rb?ds=inline diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 94754546c..085428583 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -17,27 +17,24 @@ # limitations under the License. # -include_recipe "apt" +include_recipe "apt::nginx" include_recipe "munin" +include_recipe "prometheus" +include_recipe "ssl" package "nginx" -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 + mode "644" end directory node[:nginx][:cache][:fastcgi][:directory] do owner "www-data" group "root" - mode 0o755 + mode "755" recursive true only_if { node[:nginx][:cache][:fastcgi][:enable] } end @@ -45,7 +42,7 @@ end directory node[:nginx][:cache][:proxy][:directory] do owner "www-data" group "root" - mode 0o755 + mode "755" recursive true only_if { node[:nginx][:cache][:proxy][:enable] } end @@ -64,3 +61,8 @@ package "libwww-perl" munin_plugin "nginx_request" munin_plugin "nginx_status" + +prometheus_exporter "nginx" do + port 9113 + options "--nginx.scrape-uri=http://localhost:8050/nginx_status" +end