diff --git a/config.c b/config.c index 38b66740..4af25c24 100644 --- a/config.c +++ b/config.c @@ -224,7 +224,7 @@ parse_config(t_configuration_options *options) memset(options->pg_bindir, 0, sizeof(options->pg_bindir)); memset(options->pg_ctl_options, 0, sizeof(options->pg_ctl_options)); memset(options->pg_basebackup_options, 0, sizeof(options->pg_basebackup_options)); - memset(options->pg_restore_command, 0, sizeof(options->pg_restore_command)); + memset(options->restore_command, 0, sizeof(options->restore_command)); /* default master_response_timeout is 60 seconds */ options->master_response_timeout = 60; @@ -374,8 +374,8 @@ parse_config(t_configuration_options *options) parse_event_notifications_list(options, value); else if (strcmp(name, "tablespace_mapping") == 0) tablespace_list_append(options, value); - else if (strcmp(name, "pg_restore_command") == 0) - strncpy(options->pg_restore_command, value, MAXLEN); + else if (strcmp(name, "restore_command") == 0) + strncpy(options->restore_command, value, MAXLEN); else { known_parameter = false; diff --git a/config.h b/config.h index 37186444..3449ad3c 100644 --- a/config.h +++ b/config.h @@ -72,7 +72,7 @@ typedef struct char pg_bindir[MAXLEN]; char pg_ctl_options[MAXLEN]; char pg_basebackup_options[MAXLEN]; - char pg_restore_command[MAXLEN]; + char restore_command[MAXLEN]; char logfile[MAXLEN]; int monitor_interval_secs; int retry_promote_interval_secs; diff --git a/repmgr.c b/repmgr.c index c8a0b7cf..c1ba3187 100644 --- a/repmgr.c +++ b/repmgr.c @@ -4265,11 +4265,11 @@ create_recovery_file(const char *data_dir) log_debug(_("recovery.conf: %s"), line); } - /* If pg_restore_command is set, we use it as restore_command in recovery.conf */ - if (strcmp(options.pg_restore_command, "") != 0) + /* If restore_command is set, we use it as restore_command in recovery.conf */ + if (strcmp(options.restore_command, "") != 0) { maxlen_snprintf(line, "restore_command = '%s'\n", - options.pg_restore_command); + options.restore_command); if (write_recovery_file_line(recovery_file, recovery_file_path, line) == false) return false; log_debug(_("recovery.conf: %s"), line); diff --git a/repmgr.conf.sample b/repmgr.conf.sample index 0558b085..4cfa3d71 100644 --- a/repmgr.conf.sample +++ b/repmgr.conf.sample @@ -116,7 +116,7 @@ # You can specify a restore_command to be used in the recovery.conf that # will be placed in the cloned standby # -# pg_restore_command = cp /path/to/archived/wals/%f %p +# restore_command = cp /path/to/archived/wals/%f %p # Failover settings (repmgrd) # ---------------------------