X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/730fadf59e0fc862128e7091f8cefa530fa2c6f0..89b4f69cf22dcd7ff06a83a0d901fd4c446675e9:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 2b7435585..cba5239ae 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -25,7 +25,6 @@ include_recipe "passenger" include_recipe "geoipupdate" include_recipe "git" include_recipe "memcached" -include_recipe "munin" include_recipe "mysql" include_recipe "nodejs" include_recipe "php::fpm" @@ -67,6 +66,7 @@ package %w[ libboost-program-options-dev libboost-regex-dev libboost-system-dev + libbrotli-dev libbytes-random-secure-perl libcairo2-dev libcrypto++-dev @@ -484,7 +484,7 @@ if node[:postgresql][:clusters][:"15/main"] service "cgimap@#{name}" do action [:start, :enable] - subscribes :restart, "execute[#{cgimap_directory}/Makefile]" + subscribes :restart, "execute[#{cgimap_directory}/build/Makefile]" subscribes :restart, "template[/etc/default/cgimap-#{name}]" subscribes :restart, "systemd_service[cgimap@]" end @@ -571,13 +571,6 @@ if node[:postgresql][:clusters][:"15/main"] apache_site "apis.dev.openstreetmap.org" do template "apache.apis.erb" end - - node[:postgresql][:clusters].each_key do |name| - postgresql_munin name do - cluster name - database "ALL" - end - end end directory "/srv/ooc.openstreetmap.org" do