X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..11fdeeaa56975b200a46cc3ee7124e529621fba9:/cookbooks/nginx/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index b61ba5d46..3fcb20fdb 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -1,8 +1,8 @@ # -# 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. @@ -17,31 +17,35 @@ # limitations under the License. # -package "nginx" +include_recipe "apt::nginx" +include_recipe "prometheus" +include_recipe "ssl" -resolvers = node[:networking][:nameservers].map do |resolver| - IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver -end +package %w[ + nginx + logrotate +] template "/etc/nginx/nginx.conf" do source "nginx.conf.erb" owner "root" group "root" - mode 0o644 - variables :resolvers => resolvers + mode "644" end -directory "/var/cache/nginx/fastcgi-cache" do +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 -directory "/var/cache/nginx/proxy-cache" do +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 @@ -50,3 +54,8 @@ service "nginx" do supports :status => true, :restart => true, :reload => true subscribes :restart, "template[/etc/nginx/nginx.conf]" end + +prometheus_exporter "nginx" do + port 9113 + options "--nginx.scrape-uri=http://localhost:8050/nginx_status" +end