db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-04-15 11:36:40 +02:00
Code Issues Releases Activity

Rename server-start command to server.

Browse Source
This commit is contained in:
David Steele 2021-11-18 17:23:11 -05:00
parent 1f14f45dfb
commit 2d963ce947
9 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/xml/release.xml
View File

@ -67,6 +67,19 @@
</release-improvement-list> </release-improvement-list>
<release-development-list> <release-development-list>
<release-item>
<commit subject="Rename server-start command to server."/>
<release-item-contributor-list>
<release-item-contributor id="david.steele"/>
<release-item-reviewer id="stephen.frost"/>
<!-- Actually tester, but we don't have a tag for that yet -->
<release-item-reviewer id="andrew.lecuyer"/>
</release-item-contributor-list>
<p>Add <proper>TLS</proper> server.</p>
</release-item>
<release-item> <release-item>
<github-pull-request id="1549"/> <github-pull-request id="1549"/>
@ -299,7 +312,7 @@
<release-item-reviewer id="andrew.lecuyer"/> <release-item-reviewer id="andrew.lecuyer"/>
</release-item-contributor-list> </release-item-contributor-list>
<p><proper>Add TLS</proper> server.</p> <p>Add <proper>TLS</proper> server.</p>
</release-item> </release-item>
<release-item> <release-item>

26
src/build/config/config.yaml
View File

@ -119,14 +119,14 @@ command:
local: {} local: {}
remote: {} remote: {}
server:
internal: true
server-ping: server-ping:
internal: true internal: true
log-file: false log-file: false
parameter-allowed: true parameter-allowed: true
server-start:
internal: true
stanza-create: stanza-create:
command-role: command-role:
remote: {} remote: {}
@ -607,8 +607,8 @@ option:
repo-put: {} repo-put: {}
repo-rm: {} repo-rm: {}
restore: {} restore: {}
server: {}
server-ping: {} server-ping: {}
server-start: {}
stanza-create: {} stanza-create: {}
stanza-delete: {} stanza-delete: {}
stanza-upgrade: {} stanza-upgrade: {}
@ -837,7 +837,7 @@ option:
repo-put: {} repo-put: {}
repo-rm: {} repo-rm: {}
restore: {} restore: {}
server-start: {} server: {}
stanza-create: {} stanza-create: {}
stanza-delete: {} stanza-delete: {}
stanza-upgrade: {} stanza-upgrade: {}
@ -910,7 +910,7 @@ option:
section: global section: global
type: path type: path
command: command:
server-start: server:
internal: false internal: false
tls-server-cert-file: tls-server-cert-file:
@ -918,7 +918,7 @@ option:
section: global section: global
type: path type: path
command: command:
server-start: server:
internal: false internal: false
tls-server-key-file: tls-server-key-file:
@ -926,7 +926,7 @@ option:
section: global section: global
type: path type: path
command: command:
server-start: server:
internal: false internal: false
tls-server-auth: tls-server-auth:
@ -934,7 +934,7 @@ option:
section: global section: global
type: hash type: hash
command: command:
server-start: server:
internal: false internal: false
tls-server-address: tls-server-address:
@ -943,9 +943,9 @@ option:
type: string type: string
default: localhost default: localhost
command: command:
server-ping: server:
internal: false internal: false
server-start: server-ping:
internal: false internal: false
tls-server-port: tls-server-port:
@ -955,9 +955,9 @@ option:
default: 8432 default: 8432
allow-range: [1, 65535] allow-range: [1, 65535]
command: command:
server-ping: server:
internal: false internal: false
server-start: server-ping:
internal: false internal: false
# Logging options # Logging options

4
src/build/help/help.xml
View File

@ -2273,8 +2273,8 @@
</command> </command>
<!-- =============================================================================================================== --> <!-- =============================================================================================================== -->
<command id="server-start" name="Server Start"> <command id="server" name="Server">
<summary>Start <backrest/> server.</summary> <summary><backrest/> server.</summary>
<text> <text>
<p>The <backrest/> server allows access to remote hosts without using the <proper>SSH</proper> protocol.</p> <p>The <backrest/> server allows access to remote hosts without using the <proper>SSH</proper> protocol.</p>

4
src/config/config.auto.h
View File

@ -22,8 +22,8 @@ Command constants
#define CFGCMD_REPO_PUT "repo-put" #define CFGCMD_REPO_PUT "repo-put"
#define CFGCMD_REPO_RM "repo-rm" #define CFGCMD_REPO_RM "repo-rm"
#define CFGCMD_RESTORE "restore" #define CFGCMD_RESTORE "restore"
#define CFGCMD_SERVER "server"
#define CFGCMD_SERVER_PING "server-ping" #define CFGCMD_SERVER_PING "server-ping"
#define CFGCMD_SERVER_START "server-start"
#define CFGCMD_STANZA_CREATE "stanza-create" #define CFGCMD_STANZA_CREATE "stanza-create"
#define CFGCMD_STANZA_DELETE "stanza-delete" #define CFGCMD_STANZA_DELETE "stanza-delete"
#define CFGCMD_STANZA_UPGRADE "stanza-upgrade" #define CFGCMD_STANZA_UPGRADE "stanza-upgrade"
@ -326,8 +326,8 @@ typedef enum
cfgCmdRepoPut, cfgCmdRepoPut,
cfgCmdRepoRm, cfgCmdRepoRm,
cfgCmdRestore, cfgCmdRestore,
cfgCmdServer,
cfgCmdServerPing, cfgCmdServerPing,
cfgCmdServerStart,
cfgCmdStanzaCreate, cfgCmdStanzaCreate,
cfgCmdStanzaDelete, cfgCmdStanzaDelete,
cfgCmdStanzaUpgrade, cfgCmdStanzaUpgrade,

54
src/config/parse.auto.c
View File

@ -521,10 +521,10 @@ static const ParseRuleCommand parseRuleCommand[CFG_COMMAND_TOTAL] =
// ----------------------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------------------
PARSE_RULE_COMMAND PARSE_RULE_COMMAND
( (
PARSE_RULE_COMMAND_NAME("server-ping"), PARSE_RULE_COMMAND_NAME("server"),
PARSE_RULE_COMMAND_LOCK_TYPE(lockTypeNone), PARSE_RULE_COMMAND_LOCK_TYPE(lockTypeNone),
PARSE_RULE_COMMAND_LOG_FILE(true),
PARSE_RULE_COMMAND_LOG_LEVEL_DEFAULT(logLevelInfo), PARSE_RULE_COMMAND_LOG_LEVEL_DEFAULT(logLevelInfo),
PARSE_RULE_COMMAND_PARAMETER_ALLOWED(true),
PARSE_RULE_COMMAND_ROLE_VALID_LIST PARSE_RULE_COMMAND_ROLE_VALID_LIST
( (
@ -535,10 +535,10 @@ static const ParseRuleCommand parseRuleCommand[CFG_COMMAND_TOTAL] =
// ----------------------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------------------
PARSE_RULE_COMMAND PARSE_RULE_COMMAND
( (
PARSE_RULE_COMMAND_NAME("server-start"), PARSE_RULE_COMMAND_NAME("server-ping"),
PARSE_RULE_COMMAND_LOCK_TYPE(lockTypeNone), PARSE_RULE_COMMAND_LOCK_TYPE(lockTypeNone),
PARSE_RULE_COMMAND_LOG_FILE(true),
PARSE_RULE_COMMAND_LOG_LEVEL_DEFAULT(logLevelInfo), PARSE_RULE_COMMAND_LOG_LEVEL_DEFAULT(logLevelInfo),
PARSE_RULE_COMMAND_PARAMETER_ALLOWED(true),
PARSE_RULE_COMMAND_ROLE_VALID_LIST PARSE_RULE_COMMAND_ROLE_VALID_LIST
( (
@ -1074,8 +1074,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -1460,8 +1460,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -1538,8 +1538,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -1616,8 +1616,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -1868,8 +1868,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2050,8 +2050,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2385,8 +2385,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2476,8 +2476,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2567,8 +2567,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2658,8 +2658,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -2813,8 +2813,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -4053,7 +4053,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart) PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -7666,8 +7666,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -7744,8 +7744,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -8269,8 +8269,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -8353,8 +8353,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -8437,8 +8437,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoPut)
PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm) PARSE_RULE_OPTION_COMMAND(cfgCmdRepoRm)
PARSE_RULE_OPTION_COMMAND(cfgCmdRestore) PARSE_RULE_OPTION_COMMAND(cfgCmdRestore)
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaCreate)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaDelete)
PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade) PARSE_RULE_OPTION_COMMAND(cfgCmdStanzaUpgrade)
@ -8509,8 +8509,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
), ),
PARSE_RULE_OPTIONAL PARSE_RULE_OPTIONAL
@ -8537,7 +8537,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart) PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
), ),
), ),
@ -8552,7 +8552,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart) PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
), ),
), ),
@ -8567,7 +8567,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart) PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
), ),
), ),
@ -8582,7 +8582,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart) PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
), ),
), ),
@ -8597,8 +8597,8 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST PARSE_RULE_OPTION_COMMAND_ROLE_MAIN_VALID_LIST
( (
PARSE_RULE_OPTION_COMMAND(cfgCmdServer)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing) PARSE_RULE_OPTION_COMMAND(cfgCmdServerPing)
PARSE_RULE_OPTION_COMMAND(cfgCmdServerStart)
), ),
PARSE_RULE_OPTIONAL PARSE_RULE_OPTIONAL

4
src/main.c
View File

@ -233,9 +233,9 @@ main(int argListSize, const char *argList[])
cmdStorageRemove(); cmdStorageRemove();
break; break;
// Server start command // Server command
// ----------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------
case cfgCmdServerStart: case cfgCmdServer:
cmdServer(UINT64_MAX); cmdServer(UINT64_MAX);
break; break;

2
test/lib/pgBackRestTest/Env/Host/HostBaseTest.pm
View File

@ -98,7 +98,7 @@ sub new
$strName, $strContainer, $$oParam{strImage}, $$oParam{strUser}, testRunGet()->vm(), $strName, $strContainer, $$oParam{strImage}, $$oParam{strUser}, testRunGet()->vm(),
["${strProjectPath}:${strProjectPath}", "${strTestPath}:${strTestPath}", "${strBinPath}:${strBinPath}:ro"], undef, ["${strProjectPath}:${strProjectPath}", "${strTestPath}:${strTestPath}", "${strBinPath}:${strBinPath}:ro"], undef,
$oParam->{bTls} ? $oParam->{bTls} ?
'server-start --log-level-console=debug --tls-server-ca-file=' . testRunGet()->basePath() . HOST_SERVER_CA . 'server --log-level-console=debug --tls-server-ca-file=' . testRunGet()->basePath() . HOST_SERVER_CA .
' --tls-server-cert-file=' . testRunGet()->basePath() . HOST_SERVER_CERT . ' --tls-server-key-file=' . ' --tls-server-cert-file=' . testRunGet()->basePath() . HOST_SERVER_CERT . ' --tls-server-key-file=' .
testRunGet()->basePath() . HOST_SERVER_KEY . ' --tls-server-auth=pgbackrest-client=* --tls-server-address=0.0.0.0' : testRunGet()->basePath() . HOST_SERVER_KEY . ' --tls-server-auth=pgbackrest-client=* --tls-server-address=0.0.0.0' :
undef, undef,

4
test/src/module/command/serverTest.c
View File

@ -117,7 +117,7 @@ testRun(void)
hrnCfgArgRawZ(argList, cfgOptTlsServerKeyFile, HRN_SERVER_KEY); hrnCfgArgRawZ(argList, cfgOptTlsServerKeyFile, HRN_SERVER_KEY);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db");
hrnCfgArgRawFmt(argList, cfgOptTlsServerPort, "%u", hrnServerPort(0)); hrnCfgArgRawFmt(argList, cfgOptTlsServerPort, "%u", hrnServerPort(0));
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
// Write a config file to demonstrate that settings are loaded // Write a config file to demonstrate that settings are loaded
HRN_STORAGE_PUT_Z(storageTest, "pgbackrest.conf", "[global]\nrepo1-path=" TEST_PATH "/repo"); HRN_STORAGE_PUT_Z(storageTest, "pgbackrest.conf", "[global]\nrepo1-path=" TEST_PATH "/repo");
@ -193,7 +193,7 @@ testRun(void)
hrnCfgArgRawZ(argList, cfgOptTlsServerKeyFile, HRN_SERVER_KEY); hrnCfgArgRawZ(argList, cfgOptTlsServerKeyFile, HRN_SERVER_KEY);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "bogus=*"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "bogus=*");
hrnCfgArgRawFmt(argList, cfgOptTlsServerPort, "%u", hrnServerPort(0)); hrnCfgArgRawFmt(argList, cfgOptTlsServerPort, "%u", hrnServerPort(0));
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
// Get pid of this process to identify child process later // Get pid of this process to identify child process later
pid_t pid = getpid(); pid_t pid = getpid();

10
test/src/module/protocol/protocolTest.c
View File

@ -815,7 +815,7 @@ testRun(void)
StringList *argList = strLstDup(argListBase); StringList *argList = strLstDup(argListBase);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db");
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
socketSession = ioServerAccept(socketServer, NULL); socketSession = ioServerAccept(socketServer, NULL);
@ -827,7 +827,7 @@ testRun(void)
// ----------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------
argList = strLstDup(argListBase); argList = strLstDup(argListBase);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=bogus"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=bogus");
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
socketSession = ioServerAccept(socketServer, NULL); socketSession = ioServerAccept(socketServer, NULL);
@ -837,7 +837,7 @@ testRun(void)
// ----------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------
argList = strLstDup(argListBase); argList = strLstDup(argListBase);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "bogus=*"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "bogus=*");
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
socketSession = ioServerAccept(socketServer, NULL); socketSession = ioServerAccept(socketServer, NULL);
@ -847,7 +847,7 @@ testRun(void)
// ----------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------
argList = strLstDup(argListBase); argList = strLstDup(argListBase);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=db");
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
socketSession = ioServerAccept(socketServer, NULL); socketSession = ioServerAccept(socketServer, NULL);
@ -857,7 +857,7 @@ testRun(void)
// ----------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------
argList = strLstDup(argListBase); argList = strLstDup(argListBase);
hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=*"); hrnCfgArgRawZ(argList, cfgOptTlsServerAuth, "pgbackrest-client=*");
HRN_CFG_LOAD(cfgCmdServerStart, argList); HRN_CFG_LOAD(cfgCmdServer, argList);
socketSession = ioServerAccept(socketServer, NULL); socketSession = ioServerAccept(socketServer, NULL);