Run i18n:js:export rake task on web site updates

[chef.git] / cookbooks / db / recipes / base.rb

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 4ed0a1e5ca962aa7509827655ea55cad779df891..6d6bc8ddc90b7c65c618ec8d2658a0fec662a3a7 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,8 +19,10 @@
 
 include_recipe "postgresql"
 include_recipe "git"
 
 include_recipe "postgresql"
 include_recipe "git"

+include_recipe "python"

 
 passwords = data_bag_item("db", "passwords")
 
 passwords = data_bag_item("db", "passwords")

+wal_secrets = data_bag_item("db", "wal-secrets")

 
 postgresql_munin "openstreetmap" do
   cluster node[:db][:cluster]
 
 postgresql_munin "openstreetmap" do
   cluster node[:db][:cluster]


@@ -32,10 +34,10 @@ directory "/srv/www.openstreetmap.org" do
   mode 0o2775
 end
 
   mode 0o2775
 end
 

-ruby_version = if node[:lsb][:release].to_f >= 16.04
-                 "2.3"
+ruby_version = if node[:lsb][:release].to_f >= 18.04
+                 "2.5"

                else
                else

-                 "2.1"
+                 "2.3"

                end
 
 rails_port "www.openstreetmap.org" do
                end
 
 rails_port "www.openstreetmap.org" do


@@ -43,21 +45,55 @@ rails_port "www.openstreetmap.org" do
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"

-  repository "git://git.openstreetmap.org/rails.git"
+  repository "https://git.openstreetmap.org/public/rails.git"

   revision "live"
   database_host "localhost"
   database_name "openstreetmap"
   database_username "openstreetmap"
   database_password passwords["openstreetmap"]
   gpx_dir "/store/rails/gpx"
   revision "live"
   database_host "localhost"
   database_name "openstreetmap"
   database_username "openstreetmap"
   database_password passwords["openstreetmap"]
   gpx_dir "/store/rails/gpx"

-  file_column_root "/store/rails"

 end
 
 end
 

-execute "/srv/www.openstreetmap.org/rails/db/functions/Makefile" do
+db_version = node[:db][:cluster].split("/").first
+pg_config = "/usr/lib/postgresql/#{db_version}/bin/pg_config"
+function_directory = "/srv/www.openstreetmap.org/rails/db/functions/#{db_version}"
+
+directory function_directory do
+  owner "rails"
+  group "rails"
+  mode 0o755
+end
+
+execute function_directory do

   action :nothing
   action :nothing

-  command "make"
+  command "make PG_CONFIG=#{pg_config} DESTDIR=#{function_directory}"

   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"
   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"

+  subscribes :run, "directory[#{function_directory}]"

   subscribes :run, "git[/srv/www.openstreetmap.org/rails]"
 end
   subscribes :run, "git[/srv/www.openstreetmap.org/rails]"
 end

+
+link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do
+  to "#{function_directory}/libpgosm.so"
+  owner "root"
+  group "root"
+end
+
+package "lzop"
+
+python_package "wal-e" do
+  python_version "3"
+end
+
+python_package "boto" do
+  python_version "3"
+end
+
+template "/usr/local/bin/openstreetmap-wal-e" do
+  source "wal-e.erb"
+  owner "root"
+  group "postgres"
+  mode 0o750
+  variables :s3_key => wal_secrets["s3_key"]
+end