database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-29 08:21:11 +03:00
Code Activity

Consolidate less commonly used repository storage options.

Browse Source 
The following options are renamed as specified:

repo1-azure-ca-file -> repo1-storage-ca-file
repo1-azure-ca-path -> repo1-storage-ca-path
repo1-azure-host -> repo1-storage-host
repo1-azure-port -> repo1-storage-port
repo1-azure-verify-tls -> repo1-storage-verify-tls
repo1-s3-ca-file -> repo1-storage-ca-file
repo1-s3-ca-path -> repo1-storage-ca-path
repo1-s3-host -> repo1-storage-host
repo1-s3-port -> repo1-storage-port
repo1-s3-verify-tls -> repo1-storage-verify-tls

The old option names (e.g. repo1-s3-port) will continue to work for repo1, but repo2, etc. will require the new names.
This commit is contained in:
David Steele
2021-03-02 13:51:40 -05:00
committed by GitHub
parent e64999db77
commit d1aa765a9d
21 changed files with 994 additions and 1476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/lib/pgBackRestDoc/Common/DocConfig.pm
View File

@ -336,12 +336,6 @@ sub process
if (@stryNameAlt > 0)
{
if (@stryNameAlt != 1)
{
confess &log(
ERROR, "multiple alt names are not supported for option '${strOption}': " . join(', ', @stryNameAlt));
}
$oCommandOption->{&CONFIG_HELP_NAME_ALT} = \@stryNameAlt;
}
}

6
doc/lib/pgBackRestDoc/Common/DocExecute.pm
View File

@ -628,9 +628,9 @@ sub backrestConfig
delete($$oConfigClean{&CFGDEF_SECTION_GLOBAL}{&CFGOPT_LOG_LEVEL_STDERR});
delete($$oConfigClean{&CFGDEF_SECTION_GLOBAL}{&CFGOPT_LOG_TIMESTAMP});
# Don't show repo1-azure-host option. Since Azure behaves differently with Azurite (which we use for local testing) and
# the actual service we can't just fake /etc/hosts like we do for S3.
delete($$oConfigClean{&CFGDEF_SECTION_GLOBAL}{'repo1-azure-host'});
# Don't show repo1-storage-host option. Since Azure behaves differently with Azurite (which we use for local testing)
# and the actual service we can't just fake /etc/hosts like we do for S3.
delete($$oConfigClean{&CFGDEF_SECTION_GLOBAL}{'repo1-storage-host'});
if (keys(%{$$oConfigClean{&CFGDEF_SECTION_GLOBAL}}) == 0)
{