X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4e99c5be590629426248a522a1c09ce2ab9196d1..7896792df24c1042e7ac703629cbdec1d1edf4bf:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index b6a11b905..d03b8b204 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 @@ -93,6 +93,7 @@ package %w[ nano netcat osm2pgsql + osmium-tool osmosis pandoc pandoc @@ -117,6 +118,7 @@ package %w[ pngcrush pngquant proj-bin + pyosmium python-is-python3 python3 python3-brotli @@ -320,7 +322,7 @@ if node[:postgresql][:clusters][:"15/main"] user "apis" group "www-data" umask "0002" - exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --instances 5" + exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/build/openstreetmap-cgimap --daemon --instances 5" exec_reload "/bin/kill -HUP $MAINPID" runtime_directory "cgimap-%i" sandbox :enable_network => true @@ -446,31 +448,28 @@ if node[:postgresql][:clusters][:"15/main"] group "apis" end - execute "#{cgimap_directory}/autogen.sh" do - action :nothing - command "./autogen.sh" - cwd cgimap_directory + directory "#{cgimap_directory}/build" do user "apis" group "apis" - subscribes :run, "git[#{cgimap_directory}]", :immediately + mode "0755" end - execute "#{cgimap_directory}/configure" do + execute "#{cgimap_directory}/CMakeLists.txt" do action :nothing - command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl" - cwd cgimap_directory + command "cmake .." + cwd "#{cgimap_directory}/build" user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately + subscribes :run, "git[#{cgimap_directory}]", :immediately end - execute "#{cgimap_directory}/Makefile" do + execute "#{cgimap_directory}/build/Makefile" do action :nothing command "make -j" - cwd cgimap_directory + cwd "#{cgimap_directory}/build" user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately + subscribes :run, "execute[#{cgimap_directory}/CMakeLists.txt]", :immediately end template "/etc/default/cgimap-#{name}" do @@ -487,7 +486,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 @@ -574,13 +573,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