From fa217ab1a489671634f4c6472cf8a843db72f45b Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Mon, 23 Feb 2026 14:32:21 +0530 Subject: [PATCH 1/2] Adding should restore pg dump flag. Signed-off-by: sreepuramsudheer --- src/chef-server-ctl/plugins/backup.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chef-server-ctl/plugins/backup.rb b/src/chef-server-ctl/plugins/backup.rb index 6cc51b2fbc..001b8219a9 100644 --- a/src/chef-server-ctl/plugins/backup.rb +++ b/src/chef-server-ctl/plugins/backup.rb @@ -54,6 +54,7 @@ options = OpenStruct.new options.agree_to_cleanse = nil options.restore_dir = nil + options.restore_pg_dump = false # Default is false (don't restore pg dump) OptionParser.new do |opts| opts.banner = "Usage: #{ChefUtils::Dist::Server::SERVER_CTL} restore $PATH_TO_BACKUP_TARBALL [options]" @@ -66,6 +67,10 @@ options.agree_to_cleanse = "yes" end + opts.on("--restore-pg-dump", "Restore PostgreSQL data from pg_dump instead of service data files (default: false)") do + options.restore_pg_dump = true + end + opts.on("--pg-options [string]", "Additional options to pass to PostgreSQL during backups") do |pg_options| options.pg_options = pg_options end From 7ec9a734fd76aed92d0bcdab4c349d240d8a7f29 Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Tue, 24 Feb 2026 16:40:36 +0530 Subject: [PATCH 2/2] Changing to skip pg dump. Signed-off-by: sreepuramsudheer --- src/chef-server-ctl/plugins/backup.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chef-server-ctl/plugins/backup.rb b/src/chef-server-ctl/plugins/backup.rb index 001b8219a9..b402ddcd7e 100644 --- a/src/chef-server-ctl/plugins/backup.rb +++ b/src/chef-server-ctl/plugins/backup.rb @@ -54,7 +54,7 @@ options = OpenStruct.new options.agree_to_cleanse = nil options.restore_dir = nil - options.restore_pg_dump = false # Default is false (don't restore pg dump) + options.skip_pg_dump = false # Default is false (restore pg dump) OptionParser.new do |opts| opts.banner = "Usage: #{ChefUtils::Dist::Server::SERVER_CTL} restore $PATH_TO_BACKUP_TARBALL [options]" @@ -67,8 +67,8 @@ options.agree_to_cleanse = "yes" end - opts.on("--restore-pg-dump", "Restore PostgreSQL data from pg_dump instead of service data files (default: false)") do - options.restore_pg_dump = true + opts.on("--skip-pg-dump", "Skip PostgreSQL data from pg_dump (default: false)") do + options.skip_pg_dump = true end opts.on("--pg-options [string]", "Additional options to pass to PostgreSQL during backups") do |pg_options|