From 2a6c835a5a3a7333cbbae11090527ea732574cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20K=C3=B3sz=C3=B3?= Date: Fri, 21 Mar 2014 14:18:07 +0100 Subject: [PATCH 1/3] debian init script and config file documentation fixes --- README.rst | 4 ++-- debian/repmgr.repmgrd.default | 2 +- debian/repmgr.repmgrd.init | 4 ++-- repmgr.c | 2 +- repmgrd.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 176ce5a6..83d69fe9 100644 --- a/README.rst +++ b/README.rst @@ -890,7 +890,7 @@ The output from this program looks like this:: Configuration options: -D, --data-dir=DIR local directory where the files will be copied to - -f, --config_file=PATH path to the configuration file + -f, --config-file=PATH path to the configuration file -R, --remote-user=USERNAME database server username for rsync -w, --wal-keep-segments=VALUE minimum value for the GUC wal_keep_segments (default: 5000) -I, --ignore-rsync-warning ignore rsync partial transfer warning @@ -1014,7 +1014,7 @@ The output from this program looks like this:: --version output version information, then exit --verbose output verbose activity information --monitoring-history track advance or lag of the replication in every standby in repl_monitor - -f, --config_file=PATH database to connect to + -f, --config-file=PATH database to connect to repmgrd monitors a cluster of servers. diff --git a/debian/repmgr.repmgrd.default b/debian/repmgr.repmgrd.default index 182a278d..dddd46ba 100644 --- a/debian/repmgr.repmgrd.default +++ b/debian/repmgr.repmgrd.default @@ -6,7 +6,7 @@ REPMGRD_ENABLED=no # Options for repmgrd (required) -#REPMGRD_OPTS="--config_file /path/to/repmgr.conf" +#REPMGRD_OPTS="--config-file /path/to/repmgr.conf" # User to run repmgrd as #REPMGRD_USER=postgres diff --git a/debian/repmgr.repmgrd.init b/debian/repmgr.repmgrd.init index bf7eb73b..cce2458b 100644 --- a/debian/repmgr.repmgrd.init +++ b/debian/repmgr.repmgrd.init @@ -50,7 +50,7 @@ do_start() # 0 if daemon has been started # 1 if daemon was already running # other if daemon could not be started or a failure occured - start-stop-daemon --start --quiet --chuid $REPMGRD_USER --make-pidfile --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN -- $REPMGRD_OPTS + start-stop-daemon --start --quiet --background --chuid $REPMGRD_USER --make-pidfile --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN -- $REPMGRD_OPTS } do_stop() @@ -90,7 +90,7 @@ case "$1" in $0 start ;; status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + status_of_proc -p $REPMGRD_PIDFILE $REPMGRD_BIN $NAME && exit 0 || exit $? ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 diff --git a/repmgr.c b/repmgr.c index 13b3e6f0..939ea9a7 100644 --- a/repmgr.c +++ b/repmgr.c @@ -1864,7 +1864,7 @@ help(const char *progname) printf(_(" -D, --data-dir=DIR local directory where the files will be\n" \ " copied to\n")); printf(_(" -l, --local-port=PORT standby or witness server local port\n")); - printf(_(" -f, --config_file=PATH path to the configuration file\n")); + printf(_(" -f, --config-file=PATH path to the configuration file\n")); printf(_(" -R, --remote-user=USERNAME database server username for rsync\n")); printf(_(" -w, --wal-keep-segments=VALUE minimum value for the GUC\n" \ " wal_keep_segments (default: 5000)\n")); diff --git a/repmgrd.c b/repmgrd.c index 3af7cf0d..d1702917 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -1343,7 +1343,7 @@ help(const char *progname) printf(_(" --version output version information, then exit\n")); printf(_(" --verbose output verbose activity information\n")); printf(_(" --monitoring-history track advance or lag of the replication in every standby in repl_monitor\n")); - printf(_(" -f, --config_file=PATH configuration file\n")); + printf(_(" -f, --config-file=PATH configuration file\n")); printf(_(" -d, --daemonize detach process from foreground\n")); printf(_(" -p, --pid-file=PATH write a PID file\n")); printf(_("\n%s monitors a cluster of servers.\n"), progname); From b9ab9010c08720af3bcc45ae197ad19cd54032d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20K=C3=B3sz=C3=B3?= Date: Sat, 22 Mar 2014 22:13:33 +0100 Subject: [PATCH 2/3] debian init script and config file documentation fixes --- repmgrd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repmgrd.c b/repmgrd.c index d1702917..84ffb2a2 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -160,7 +160,7 @@ main(int argc, char **argv) { static struct option long_options[] = { - {"config", required_argument, NULL, 'f'}, + {"config-file", required_argument, NULL, 'f'}, {"verbose", no_argument, NULL, 'v'}, {"monitoring-history", no_argument, NULL, 'm'}, {"daemonize", no_argument, NULL, 'd'}, @@ -1343,7 +1343,7 @@ help(const char *progname) printf(_(" --version output version information, then exit\n")); printf(_(" --verbose output verbose activity information\n")); printf(_(" --monitoring-history track advance or lag of the replication in every standby in repl_monitor\n")); - printf(_(" -f, --config-file=PATH configuration file\n")); + printf(_(" -f, --config-file=PATH path to the configuration file\n")); printf(_(" -d, --daemonize detach process from foreground\n")); printf(_(" -p, --pid-file=PATH write a PID file\n")); printf(_("\n%s monitors a cluster of servers.\n"), progname); From b3c68dead83982f005ae577b81448f5d1bae4529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20K=C3=B3sz=C3=B3?= Date: Sat, 22 Mar 2014 22:23:15 +0100 Subject: [PATCH 3/3] debian init script and config file documentation fixes --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 83d69fe9..4e2317eb 100644 --- a/README.rst +++ b/README.rst @@ -1014,7 +1014,7 @@ The output from this program looks like this:: --version output version information, then exit --verbose output verbose activity information --monitoring-history track advance or lag of the replication in every standby in repl_monitor - -f, --config-file=PATH database to connect to + -f, --config-file=PATH path to the configuration file repmgrd monitors a cluster of servers.