From 9dfdf6bc9b3806e8a73caf93f82d92c7c10f1767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 7 Oct 2026 17:53:57 +0200 Subject: [PATCH] Remove the backup gem from Mastodon The shared backup cookbook hardcodes postgresql-client-12, which does not exist on Ubuntu 24.04. Drop the Mastodon backup recipe and its role inclusion; the PostgreSQL standby is the safety net. The backup cookbook itself is still used by other services. --- roles/mastodon.rb | 1 - site-cookbooks/kosmos-mastodon/metadata.rb | 1 - .../kosmos-mastodon/recipes/backup.rb | 17 ----------------- 3 files changed, 19 deletions(-) delete mode 100644 site-cookbooks/kosmos-mastodon/recipes/backup.rb diff --git a/roles/mastodon.rb b/roles/mastodon.rb index 4b202c7..28761b2 100644 --- a/roles/mastodon.rb +++ b/roles/mastodon.rb @@ -8,5 +8,4 @@ run_list %w( role[postgresql_client] kosmos-mastodon::libretranslate kosmos-mastodon - kosmos-mastodon::backup ) diff --git a/site-cookbooks/kosmos-mastodon/metadata.rb b/site-cookbooks/kosmos-mastodon/metadata.rb index 4e9883f..74dccb4 100644 --- a/site-cookbooks/kosmos-mastodon/metadata.rb +++ b/site-cookbooks/kosmos-mastodon/metadata.rb @@ -6,7 +6,6 @@ description 'Installs/Configures Mastodon' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.2.1' -depends 'backup' depends 'elasticsearch' depends 'firewall' depends 'postgresql' diff --git a/site-cookbooks/kosmos-mastodon/recipes/backup.rb b/site-cookbooks/kosmos-mastodon/recipes/backup.rb deleted file mode 100644 index 921bf35..0000000 --- a/site-cookbooks/kosmos-mastodon/recipes/backup.rb +++ /dev/null @@ -1,17 +0,0 @@ -# -# Cookbook Name:: kosmos-mastodon -# Recipe:: backup -# - -postgresql_data_bag_item = data_bag_item('credentials', 'postgresql') - -unless node.chef_environment == "development" - node.override['backup']['s3']['keep'] = 1 - node.override["backup"]["postgresql"]["host"] = "pg.kosmos.local" - node.override["backup"]["postgresql"]["databases"]["mastodon"] = { - username: "mastodon", - password: postgresql_data_bag_item['mastodon_user_password'] - } - - include_recipe "backup" -end