Make sure dnscontrol is on the path in DNS update scripts

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 3f99204872f92adfb665a5c23d1ed2d8bc528dc7..f92a6ea0bf02e6d19e6d08673194636b334373bc 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: db
+# Cookbook:: db

 # Recipe:: base
 #
 # Recipe:: base
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,


@@ -17,10 +17,18 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "postgresql"
+include_recipe "accounts"

 include_recipe "git"
 include_recipe "git"

+include_recipe "postgresql"
+include_recipe "python"

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

+wal_secrets = data_bag_item("db", "wal-secrets")
+
+ruby_version = node[:passenger][:ruby_version]
+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}"

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


@@ -29,28 +37,59 @@ end
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"

-  mode 02775
+  mode 0o2775

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

+  ruby ruby_version

   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
+directory function_directory do
+  owner "rails"
+  group "rails"
+  mode 0o755
+end
+
+execute function_directory do

   action :nothing
   action :nothing

-  command "make"
+  command "make BUNDLE=bundle#{ruby_version} 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, resources(:git => "/srv/www.openstreetmap.org/rails")
+  subscribes :run, "directory[#{function_directory}]"
+  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
 end