Stop installing rails code on database servers

diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb
index c81fffe5b35650c04ee818711ab58d14c1efeae5..6deed8bbe322dec037c1d69a06d985b2d6e06c0d 100644 (file)
--- a/cookbooks/db/metadata.rb
+++ b/cookbooks/db/metadata.rb
@@ -12,4 +12,3 @@ depends           "postgresql"
 depends           "python"
 depends           "ruby"
 depends           "systemd"
 depends           "python"
 depends           "ruby"
 depends           "systemd"

-depends           "web"

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index d989d0bc91dd5f3bd16eb19b4a768a2c0aad16fd..4acfcc25dac443eddf9c87dc6709436e5e918e22 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -23,27 +23,8 @@ include_recipe "postgresql"
 include_recipe "python"
 include_recipe "ruby"
 
 include_recipe "python"
 include_recipe "ruby"
 

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

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

-directory "/srv/www.openstreetmap.org" do
-  group "rails"
-  mode "2775"
-end
-
-rails_port "www.openstreetmap.org" do
-  directory "/srv/www.openstreetmap.org/rails"
-  user "rails"
-  group "rails"
-  repository "https://git.openstreetmap.org/public/rails.git"
-  revision "live"
-  build_assets false
-  database_host "localhost"
-  database_name "openstreetmap"
-  database_username "openstreetmap"
-  database_password passwords["openstreetmap"]
-end
-

 package %w[
   cmake
   libosmium2-dev
 package %w[
   cmake
   libosmium2-dev