You've already forked pgbackrest
mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2026-06-20 01:17:49 +02:00
Cleanup pg-host options for unsupported remote restore.
Restoring to a remote pg-host is not supported but the options were a bit untidy. Many options were marked as internal but should be invalid. repo-host-type and repo-host are required to let restore know if a pg-host is configured and remain internal but the rest of the pg-host-* options are now invalid for restore. The same applies to the archive-get and archive-push commands although these were less likely to cause confusion. Also reverse the dependency of pg-host and pg-host-type, i.e. make pg-host-type depend on pg-host, and alter pg-host-cmd and pg-host-user to depend on pg-host-type=ssh.
This commit is contained in:
David Steele
@@ -1489,11 +1489,33 @@ option:
|
|||||||
db-host: {}
|
db-host: {}
|
||||||
db?-host: {}
|
db?-host: {}
|
||||||
|
|
||||||
|
pg-host-type:
|
||||||
|
section: global
|
||||||
|
group: pg
|
||||||
|
type: string-id
|
||||||
|
default: ssh
|
||||||
|
allow-list:
|
||||||
|
- ssh
|
||||||
|
- tls
|
||||||
|
command:
|
||||||
|
backup: {}
|
||||||
|
check: {}
|
||||||
|
manifest: {}
|
||||||
|
stanza-create: {}
|
||||||
|
stanza-delete: {}
|
||||||
|
stanza-upgrade: {}
|
||||||
|
command-role:
|
||||||
|
async: {}
|
||||||
|
main: {}
|
||||||
|
local: {}
|
||||||
|
depend:
|
||||||
|
option: pg-host
|
||||||
|
|
||||||
pg-host-cert-file:
|
pg-host-cert-file:
|
||||||
section: global
|
section: global
|
||||||
group: pg
|
group: pg
|
||||||
type: string
|
type: string
|
||||||
command: pg-local
|
command: pg-host-type
|
||||||
command-role:
|
command-role:
|
||||||
async: {}
|
async: {}
|
||||||
main: {}
|
main: {}
|
||||||
@@ -1520,40 +1542,45 @@ option:
|
|||||||
type: string
|
type: string
|
||||||
default-type: dynamic
|
default-type: dynamic
|
||||||
default: bin
|
default: bin
|
||||||
command:
|
command: pg-host-type
|
||||||
backup: {}
|
command-role:
|
||||||
check: {}
|
async: {}
|
||||||
manifest: {}
|
main: {}
|
||||||
stanza-create: {}
|
local: {}
|
||||||
stanza-delete: {}
|
depend:
|
||||||
stanza-upgrade: {}
|
option: pg-host-type
|
||||||
|
list:
|
||||||
|
- ssh
|
||||||
|
deprecate:
|
||||||
|
db-cmd: {}
|
||||||
|
db?-cmd: {}
|
||||||
|
|
||||||
|
pg-host-config:
|
||||||
|
section: stanza
|
||||||
|
group: pg
|
||||||
|
type: path
|
||||||
|
default-type: literal
|
||||||
|
default: CFGOPTDEF_CONFIG_PATH "/" PROJECT_CONFIG_FILE
|
||||||
|
command: pg-host-type
|
||||||
command-role:
|
command-role:
|
||||||
async: {}
|
async: {}
|
||||||
main: {}
|
main: {}
|
||||||
local: {}
|
local: {}
|
||||||
depend:
|
depend:
|
||||||
option: pg-host
|
option: pg-host
|
||||||
deprecate:
|
|
||||||
db-cmd: {}
|
|
||||||
db?-cmd: {}
|
|
||||||
|
|
||||||
pg-host-config:
|
|
||||||
inherit: pg-host-cmd
|
|
||||||
default-type: literal
|
|
||||||
default: CFGOPTDEF_CONFIG_PATH "/" PROJECT_CONFIG_FILE
|
|
||||||
deprecate:
|
deprecate:
|
||||||
db-config: {}
|
db-config: {}
|
||||||
db?-config: {}
|
db?-config: {}
|
||||||
|
|
||||||
pg-host-config-include-path:
|
pg-host-config-include-path:
|
||||||
inherit: pg-host-cmd
|
inherit: pg-host-config
|
||||||
type: path
|
type: path
|
||||||
default-type: literal
|
default-type: literal
|
||||||
default: CFGOPTDEF_CONFIG_PATH "/" PROJECT_CONFIG_INCLUDE_PATH
|
default: CFGOPTDEF_CONFIG_PATH "/" PROJECT_CONFIG_INCLUDE_PATH
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
pg-host-config-path:
|
pg-host-config-path:
|
||||||
inherit: pg-host-cmd
|
inherit: pg-host-config
|
||||||
type: path
|
type: path
|
||||||
default-type: literal
|
default-type: literal
|
||||||
default: CFGOPTDEF_CONFIG_PATH
|
default: CFGOPTDEF_CONFIG_PATH
|
||||||
@@ -1582,28 +1609,14 @@ option:
|
|||||||
default-type: quote
|
default-type: quote
|
||||||
default: postgres
|
default: postgres
|
||||||
required: false
|
required: false
|
||||||
|
depend:
|
||||||
|
option: pg-host-type
|
||||||
|
list:
|
||||||
|
- ssh
|
||||||
deprecate:
|
deprecate:
|
||||||
db-user: {}
|
db-user: {}
|
||||||
db?-user: {}
|
db?-user: {}
|
||||||
|
|
||||||
pg-host-type:
|
|
||||||
section: global
|
|
||||||
group: pg
|
|
||||||
type: string-id
|
|
||||||
default: ssh
|
|
||||||
allow-list:
|
|
||||||
- ssh
|
|
||||||
- tls
|
|
||||||
command: pg-local
|
|
||||||
command-role:
|
|
||||||
async: {}
|
|
||||||
main: {}
|
|
||||||
local: {}
|
|
||||||
depend:
|
|
||||||
option: pg-local
|
|
||||||
list:
|
|
||||||
- false
|
|
||||||
|
|
||||||
pg-path:
|
pg-path:
|
||||||
section: stanza
|
section: stanza
|
||||||
group: pg
|
group: pg
|
||||||
|
|||||||
+7
-101
@@ -3894,38 +3894,19 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-ca-file
|
||||||
// opt/pg-host-ca-file
|
// opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL_LIST // opt/pg-host-ca-file
|
|
||||||
( // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchiveGet, true), // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchivePush, true), // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(Restore, true), // opt/pg-host-ca-file
|
|
||||||
) // opt/pg-host-ca-file
|
|
||||||
// opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-ca-file
|
||||||
( // opt/pg-host-ca-file
|
( // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-ca-file
|
||||||
), // opt/pg-host-ca-file
|
), // opt/pg-host-ca-file
|
||||||
// opt/pg-host-ca-file
|
// opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_ASYNC_VALID_LIST // opt/pg-host-ca-file
|
|
||||||
( // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-file
|
|
||||||
), // opt/pg-host-ca-file
|
|
||||||
// opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-ca-file
|
||||||
( // opt/pg-host-ca-file
|
( // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-ca-file
|
|
||||||
), // opt/pg-host-ca-file
|
), // opt/pg-host-ca-file
|
||||||
// opt/pg-host-ca-file
|
// opt/pg-host-ca-file
|
||||||
PARSE_RULE_OPTIONAL // opt/pg-host-ca-file
|
PARSE_RULE_OPTIONAL // opt/pg-host-ca-file
|
||||||
@@ -3950,38 +3931,19 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-ca-path
|
||||||
// opt/pg-host-ca-path
|
// opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL_LIST // opt/pg-host-ca-path
|
|
||||||
( // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchiveGet, true), // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchivePush, true), // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(Restore, true), // opt/pg-host-ca-path
|
|
||||||
) // opt/pg-host-ca-path
|
|
||||||
// opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-ca-path
|
||||||
( // opt/pg-host-ca-path
|
( // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-ca-path
|
||||||
), // opt/pg-host-ca-path
|
), // opt/pg-host-ca-path
|
||||||
// opt/pg-host-ca-path
|
// opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_ASYNC_VALID_LIST // opt/pg-host-ca-path
|
|
||||||
( // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-path
|
|
||||||
), // opt/pg-host-ca-path
|
|
||||||
// opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-ca-path
|
||||||
( // opt/pg-host-ca-path
|
( // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-ca-path
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-path
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-ca-path
|
|
||||||
), // opt/pg-host-ca-path
|
), // opt/pg-host-ca-path
|
||||||
// opt/pg-host-ca-path
|
// opt/pg-host-ca-path
|
||||||
PARSE_RULE_OPTIONAL // opt/pg-host-ca-path
|
PARSE_RULE_OPTIONAL // opt/pg-host-ca-path
|
||||||
@@ -4006,38 +3968,19 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-cert-file
|
||||||
// opt/pg-host-cert-file
|
// opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL_LIST // opt/pg-host-cert-file
|
|
||||||
( // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchiveGet, true), // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchivePush, true), // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(Restore, true), // opt/pg-host-cert-file
|
|
||||||
) // opt/pg-host-cert-file
|
|
||||||
// opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-cert-file
|
||||||
( // opt/pg-host-cert-file
|
( // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-cert-file
|
||||||
), // opt/pg-host-cert-file
|
), // opt/pg-host-cert-file
|
||||||
// opt/pg-host-cert-file
|
// opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_ASYNC_VALID_LIST // opt/pg-host-cert-file
|
|
||||||
( // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-cert-file
|
|
||||||
), // opt/pg-host-cert-file
|
|
||||||
// opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-cert-file
|
||||||
( // opt/pg-host-cert-file
|
( // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-cert-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-cert-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-cert-file
|
|
||||||
), // opt/pg-host-cert-file
|
), // opt/pg-host-cert-file
|
||||||
// opt/pg-host-cert-file
|
// opt/pg-host-cert-file
|
||||||
PARSE_RULE_OPTIONAL // opt/pg-host-cert-file
|
PARSE_RULE_OPTIONAL // opt/pg-host-cert-file
|
||||||
@@ -4084,7 +4027,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
( // opt/pg-host-cmd
|
( // opt/pg-host-cmd
|
||||||
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-cmd
|
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-cmd
|
||||||
( // opt/pg-host-cmd
|
( // opt/pg-host-cmd
|
||||||
PARSE_RULE_VAL_OPT(PgHost), // opt/pg-host-cmd
|
PARSE_RULE_VAL_OPT(PgHostType), // opt/pg-host-cmd
|
||||||
|
PARSE_RULE_VAL_STRID(Ssh), // opt/pg-host-cmd
|
||||||
), // opt/pg-host-cmd
|
), // opt/pg-host-cmd
|
||||||
// opt/pg-host-cmd
|
// opt/pg-host-cmd
|
||||||
PARSE_RULE_OPTIONAL_DEFAULT // opt/pg-host-cmd
|
PARSE_RULE_OPTIONAL_DEFAULT // opt/pg-host-cmd
|
||||||
@@ -4098,7 +4042,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION // opt/pg-host-config
|
PARSE_RULE_OPTION // opt/pg-host-config
|
||||||
( // opt/pg-host-config
|
( // opt/pg-host-config
|
||||||
PARSE_RULE_OPTION_NAME("pg-host-config"), // opt/pg-host-config
|
PARSE_RULE_OPTION_NAME("pg-host-config"), // opt/pg-host-config
|
||||||
PARSE_RULE_OPTION_TYPE(String), // opt/pg-host-config
|
PARSE_RULE_OPTION_TYPE(Path), // opt/pg-host-config
|
||||||
PARSE_RULE_OPTION_RESET(true), // opt/pg-host-config
|
PARSE_RULE_OPTION_RESET(true), // opt/pg-host-config
|
||||||
PARSE_RULE_OPTION_REQUIRED(true), // opt/pg-host-config
|
PARSE_RULE_OPTION_REQUIRED(true), // opt/pg-host-config
|
||||||
PARSE_RULE_OPTION_SECTION(Stanza), // opt/pg-host-config
|
PARSE_RULE_OPTION_SECTION(Stanza), // opt/pg-host-config
|
||||||
@@ -4227,38 +4171,19 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-key-file
|
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-key-file
|
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-key-file
|
||||||
// opt/pg-host-key-file
|
// opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL_LIST // opt/pg-host-key-file
|
|
||||||
( // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchiveGet, true), // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchivePush, true), // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(Restore, true), // opt/pg-host-key-file
|
|
||||||
) // opt/pg-host-key-file
|
|
||||||
// opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-key-file
|
||||||
( // opt/pg-host-key-file
|
( // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-key-file
|
||||||
), // opt/pg-host-key-file
|
), // opt/pg-host-key-file
|
||||||
// opt/pg-host-key-file
|
// opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_ASYNC_VALID_LIST // opt/pg-host-key-file
|
|
||||||
( // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-key-file
|
|
||||||
), // opt/pg-host-key-file
|
|
||||||
// opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-key-file
|
||||||
( // opt/pg-host-key-file
|
( // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-key-file
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-key-file
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-key-file
|
|
||||||
), // opt/pg-host-key-file
|
), // opt/pg-host-key-file
|
||||||
// opt/pg-host-key-file
|
// opt/pg-host-key-file
|
||||||
PARSE_RULE_OPTIONAL // opt/pg-host-key-file
|
PARSE_RULE_OPTIONAL // opt/pg-host-key-file
|
||||||
@@ -4336,38 +4261,19 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-type
|
PARSE_RULE_OPTION_SECTION(Global), // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-type
|
PARSE_RULE_OPTION_GROUP_ID(Pg), // opt/pg-host-type
|
||||||
// opt/pg-host-type
|
// opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL_LIST // opt/pg-host-type
|
|
||||||
( // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchiveGet, true), // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(ArchivePush, true), // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND_INTERNAL(Restore, true), // opt/pg-host-type
|
|
||||||
) // opt/pg-host-type
|
|
||||||
// opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST // opt/pg-host-type
|
||||||
( // opt/pg-host-type
|
( // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(Check) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(Manifest) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(StanzaCreate) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(StanzaDelete) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(StanzaUpgrade) // opt/pg-host-type
|
||||||
), // opt/pg-host-type
|
), // opt/pg-host-type
|
||||||
// opt/pg-host-type
|
// opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_ASYNC_VALID_LIST // opt/pg-host-type
|
|
||||||
( // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-type
|
|
||||||
), // opt/pg-host-type
|
|
||||||
// opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND_ROLE_LOCAL_VALID_LIST // opt/pg-host-type
|
||||||
( // opt/pg-host-type
|
( // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchiveGet) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(ArchivePush) // opt/pg-host-type
|
|
||||||
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-type
|
PARSE_RULE_OPTION_COMMAND(Backup) // opt/pg-host-type
|
||||||
PARSE_RULE_OPTION_COMMAND(Restore) // opt/pg-host-type
|
|
||||||
), // opt/pg-host-type
|
), // opt/pg-host-type
|
||||||
// opt/pg-host-type
|
// opt/pg-host-type
|
||||||
PARSE_RULE_OPTIONAL // opt/pg-host-type
|
PARSE_RULE_OPTIONAL // opt/pg-host-type
|
||||||
@@ -4376,8 +4282,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
( // opt/pg-host-type
|
( // opt/pg-host-type
|
||||||
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-type
|
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-type
|
||||||
( // opt/pg-host-type
|
( // opt/pg-host-type
|
||||||
PARSE_RULE_VAL_OPT(PgLocal), // opt/pg-host-type
|
PARSE_RULE_VAL_OPT(PgHost), // opt/pg-host-type
|
||||||
PARSE_RULE_VAL_BOOL_FALSE, // opt/pg-host-type
|
|
||||||
), // opt/pg-host-type
|
), // opt/pg-host-type
|
||||||
// opt/pg-host-type
|
// opt/pg-host-type
|
||||||
PARSE_RULE_OPTIONAL_ALLOW_LIST // opt/pg-host-type
|
PARSE_RULE_OPTIONAL_ALLOW_LIST // opt/pg-host-type
|
||||||
@@ -4424,7 +4329,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
|
|||||||
( // opt/pg-host-user
|
( // opt/pg-host-user
|
||||||
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-user
|
PARSE_RULE_OPTIONAL_DEPEND // opt/pg-host-user
|
||||||
( // opt/pg-host-user
|
( // opt/pg-host-user
|
||||||
PARSE_RULE_VAL_OPT(PgHost), // opt/pg-host-user
|
PARSE_RULE_VAL_OPT(PgHostType), // opt/pg-host-user
|
||||||
|
PARSE_RULE_VAL_STRID(Ssh), // opt/pg-host-user
|
||||||
), // opt/pg-host-user
|
), // opt/pg-host-user
|
||||||
// opt/pg-host-user
|
// opt/pg-host-user
|
||||||
PARSE_RULE_OPTIONAL_DEFAULT // opt/pg-host-user
|
PARSE_RULE_OPTIONAL_DEFAULT // opt/pg-host-user
|
||||||
@@ -11734,7 +11640,6 @@ static const uint8_t optionResolveOrder[] =
|
|||||||
cfgOptForce, // opt-resolve-order
|
cfgOptForce, // opt-resolve-order
|
||||||
cfgOptPgDatabase, // opt-resolve-order
|
cfgOptPgDatabase, // opt-resolve-order
|
||||||
cfgOptPgHost, // opt-resolve-order
|
cfgOptPgHost, // opt-resolve-order
|
||||||
cfgOptPgHostCmd, // opt-resolve-order
|
|
||||||
cfgOptPgHostConfig, // opt-resolve-order
|
cfgOptPgHostConfig, // opt-resolve-order
|
||||||
cfgOptPgHostConfigIncludePath, // opt-resolve-order
|
cfgOptPgHostConfigIncludePath, // opt-resolve-order
|
||||||
cfgOptPgHostConfigPath, // opt-resolve-order
|
cfgOptPgHostConfigPath, // opt-resolve-order
|
||||||
@@ -11795,6 +11700,7 @@ static const uint8_t optionResolveOrder[] =
|
|||||||
cfgOptPgHostCaFile, // opt-resolve-order
|
cfgOptPgHostCaFile, // opt-resolve-order
|
||||||
cfgOptPgHostCaPath, // opt-resolve-order
|
cfgOptPgHostCaPath, // opt-resolve-order
|
||||||
cfgOptPgHostCertFile, // opt-resolve-order
|
cfgOptPgHostCertFile, // opt-resolve-order
|
||||||
|
cfgOptPgHostCmd, // opt-resolve-order
|
||||||
cfgOptPgHostKeyFile, // opt-resolve-order
|
cfgOptPgHostKeyFile, // opt-resolve-order
|
||||||
cfgOptPgHostPort, // opt-resolve-order
|
cfgOptPgHostPort, // opt-resolve-order
|
||||||
cfgOptRepoGcsBucket, // opt-resolve-order
|
cfgOptRepoGcsBucket, // opt-resolve-order
|
||||||
|
|||||||
Reference in New Issue
Block a user