From ee2f186402b3168305b473b86a738da1a7e45449 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 3 Oct 2024 18:26:50 +0100 Subject: [PATCH] Stop installing rails code on database servers --- cookbooks/db/metadata.rb | 1 - cookbooks/db/recipes/base.rb | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb index c81fffe5b..6deed8bbe 100644 --- a/cookbooks/db/metadata.rb +++ b/cookbooks/db/metadata.rb @@ -12,4 +12,3 @@ depends "postgresql" depends "python" depends "ruby" depends "systemd" -depends "web" diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index d989d0bc9..4acfcc25d 100644 --- 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" -passwords = data_bag_item("db", "passwords") 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 -- 2.39.5