From dc9e46647fe123c5bb3d3d51c867c41ee6137f4d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 12 Jul 2026 11:56:56 +0100 Subject: [PATCH] Cleanup wal-g installations --- cookbooks/db/recipes/base.rb | 19 ++++--------------- cookbooks/db/templates/default/wal-g.erb | 11 ----------- 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 cookbooks/db/templates/default/wal-g.erb diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 1a2f058f4..630694eaa 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -21,8 +21,6 @@ include_recipe "git" include_recipe "postgresql" include_recipe "ruby" -aws_credentials = data_bag_item("db", "aws") - package %w[ cmake g++ @@ -84,19 +82,10 @@ end package "lzop" -remote_file "/usr/local/bin/wal-g" do - action :create - source "https://github.com/wal-g/wal-g/releases/download/v2.0.1/wal-g-pg-ubuntu-20.04-amd64" - owner "root" - group "root" - mode "755" +file "/usr/local/bin/wal-g" do + action :delete end -template "/usr/local/bin/openstreetmap-wal-g" do - source "wal-g.erb" - owner "root" - group "postgres" - mode "750" - variables :aws_credentials => aws_credentials - sensitive true +file "/usr/local/bin/openstreetmap-wal-g" do + action :delete end diff --git a/cookbooks/db/templates/default/wal-g.erb b/cookbooks/db/templates/default/wal-g.erb deleted file mode 100644 index 434fba791..000000000 --- a/cookbooks/db/templates/default/wal-g.erb +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# DO NOT EDIT - This file is being maintained by Chef - -export WALG_S3_PREFIX="s3://openstreetmap-wal/" -export WALG_COMPRESSION_METHOD="lz4" -export AWS_ACCESS_KEY_ID="<%= @aws_credentials["wal_access_key_id"] %>" -export AWS_SECRET_ACCESS_KEY="<%= @aws_credentials["wal_secret_access_key"] %>" -export AWS_REGION="eu-west-2" - -exec /usr/local/bin/wal-g "$@" < /dev/null -- 2.47.3