From 6f80ebfc414f15dda1700a82b1c9970362ec51d1 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 6 Aug 2024 14:11:48 +0100 Subject: [PATCH] Revert "FIX: backup_restore.rb wants db user from user, not username (#28229)" (#28245) This reverts commit 2e8273dcb47dbe8e66a9e1d24cfb52cdc963b155. We're seeing this cause issues in production multisite environments. Reverting while we investigate --- lib/backup_restore.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/backup_restore.rb b/lib/backup_restore.rb index 74310e1eefa..f30d82e32d2 100644 --- a/lib/backup_restore.rb +++ b/lib/backup_restore.rb @@ -135,7 +135,7 @@ module BackupRestore DatabaseConfiguration.new( config["backup_host"] || config["host"], config["backup_port"] || config["port"], - config["user"] || username || ENV["USER"] || "postgres", + config["username"] || username || ENV["USER"] || "postgres", config["password"] || password, config["database"], )