X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3299fcbfdf657aa8ce1fdf4f1c63dbe4433d81a7..11fdeeaa56975b200a46cc3ee7124e529621fba9:/cookbooks/nginx/recipes/default.rb?ds=inline diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index ae6fb2362..3fcb20fdb 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -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 @@ -51,11 +55,7 @@ service "nginx" do subscribes :restart, "template[/etc/nginx/nginx.conf]" end -munin_plugin_conf "nginx" do - template "munin.erb" +prometheus_exporter "nginx" do + port 9113 + options "--nginx.scrape-uri=http://localhost:8050/nginx_status" end - -package "libwww-perl" - -munin_plugin "nginx_request" -munin_plugin "nginx_status"