X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae7c3c728ad4b1a4a1c71715a43e1f0d44a5289b..54e60013a7d0c78409ef63538ff65f6a2e30b20e:/cookbooks/db/recipes/base.rb?ds=sidebyside diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index f92a6ea0b..617392701 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -37,7 +37,7 @@ end directory "/srv/www.openstreetmap.org" do group "rails" - mode 0o2775 + mode "2775" end rails_port "www.openstreetmap.org" do @@ -47,6 +47,7 @@ rails_port "www.openstreetmap.org" do group "rails" repository "https://git.openstreetmap.org/public/rails.git" revision "live" + build_assets false database_host "localhost" database_name "openstreetmap" database_username "openstreetmap" @@ -57,7 +58,7 @@ end directory function_directory do owner "rails" group "rails" - mode 0o755 + mode "755" end execute function_directory do @@ -76,6 +77,58 @@ link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do group "root" end +package %w[ + cmake + libosmium2-dev + libprotozero-dev + libboost-filesystem-dev + libboost-program-options-dev + libbz2-dev + zlib1g-dev + libexpat1-dev + libyaml-cpp-dev + libpqxx-dev +] + +git "/opt/osmdbt" do + action :sync + repository "https://github.com/openstreetmap/osmdbt.git" + revision "v0.2" + depth 1 + user "root" + group "root" +end + +directory "/opt/osmdbt/build-#{db_version}" do + owner "root" + group "root" + mode "755" +end + +execute "/opt/osmdbt/CMakeLists.txt" do + action :nothing + command "cmake -DPG_CONFIG=/usr/lib/postgresql/#{db_version}/bin/pg_config .." + cwd "/opt/osmdbt/build-#{db_version}" + user "root" + group "root" + subscribes :run, "git[/opt/osmdbt]" +end + +execute "/opt/osmdbt/build-#{db_version}/postgresql-plugin/Makefile" do + action :nothing + command "make" + cwd "/opt/osmdbt/build-#{db_version}/postgresql-plugin" + user "root" + group "root" + subscribes :run, "execute[/opt/osmdbt/CMakeLists.txt]" +end + +link "/usr/lib/postgresql/#{db_version}/lib/osm-logical.so" do + to "/opt/osmdbt/build-#{db_version}/postgresql-plugin/osm-logical.so" + owner "root" + group "root" +end + package "lzop" python_package "wal-e" do @@ -90,6 +143,6 @@ template "/usr/local/bin/openstreetmap-wal-e" do source "wal-e.erb" owner "root" group "postgres" - mode 0o750 + mode "750" variables :s3_key => wal_secrets["s3_key"] end