Update version and history for minor release 2.0.2

Fix master port check
Check introduced in dc0dfe9b56 was comparing the provided database name instead of the port.
2026-03-23 15:16:29 +00:00 · 2015-02-17 16:06:00 +09:00 · 2015-02-12 14:43:53 +09:00 · 2015-02-10 20:28:17 -05:00 · 2014-11-10 12:38:18 -05:00 · 2014-11-10 12:37:10 -05:00
53 changed files with 4247 additions and 16500 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,31 +0,0 @@
 License and Contributions
 =========================
 `repmgr` is licensed under the GPL v3.  All of its code and documentation is
 Copyright 2010-2017, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
 details.
 The development of repmgr has primarily been sponsored by 2ndQuadrant customers.
 Additional work has been sponsored by the 4CaaST project for cloud computing,
 which has received funding from the European Union's Seventh Framework Programme
 (FP7/2007-2013) under grant agreement 258862.
 Contributions to `repmgr` are welcome, and will be listed in the file `CREDITS`.
 2ndQuadrant Limited requires that any contributions provide a copyright
 assignment and a disclaimer of any work-for-hire ownership claims from the
 employer of the developer.  This lets us make sure that all of the repmgr
 distribution remains free code.  Please contact info@2ndQuadrant.com for a
 copy of the relevant Copyright Assignment Form.
 Code style
 ----------
 Code in repmgr should be formatted to the same standards as the main PostgreSQL
 project. For more details see:
    https://www.postgresql.org/docs/current/static/source-format.html
 Contributors should reformat their code similarly before submitting code to
 the project, in order to minimize merge conflicts with other work.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017, 2ndQuadrant Limited
+Copyright (c) 2010-2014, 2ndQuadrant Limited
 All rights reserved.
 This program is free software: you can redistribute it and/or modify
--- a/FAILOVER.rst
+++ b/FAILOVER.rst
@@ -1 +0,0 @@
 The contents of this file have been incorporated into the main README.md document.
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,183 +0,0 @@
 FAQ - Frequently Asked Questions about repmgr
 =============================================
 This FAQ applies to `repmgr` 3.0 and later.
 General
 -------
 - What's the difference between the repmgr versions?
  repmgr 3.x builds on the improved replication facilities added
  in PostgreSQL 9.3, as well as improved automated failover support
  via `repmgrd`, and is not compatible with PostgreSQL 9.2 and earlier.
  repmgr 2.x supports PostgreSQL 9.0 onwards. While it is compatible
  with  PostgreSQL 9.3 and later, we recommend repmgr v3.
 - What's the advantage of using replication slots?
  Replication slots, introduced in PostgreSQL 9.4, ensure that the
  master server will retain WAL files until they have been consumed
  by all standby servers. This makes WAL file management much easier,
  and if used `repmgr` will no longer insist on a fixed number (default: 5000)
  of WAL files being preserved.
  (However this does mean that if a standby is no longer connected to the
  master, the master will retain WAL files indefinitely).
 - How many replication slots should I define in `max_replication_slots`?
  Normally at least same number as the number of standbys which will connect
  to the node. Note that changes to `max_replication_slots` require a server
  restart to take effect, and as there is no particular penalty for unused
  replication slots, setting a higher figure will make adding new nodes
  easier.
 - Does `repmgr` support hash indexes?
  No. Hash indexes and replication do not mix well and their use is
  explicitly discouraged; see:
    https://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175
 `repmgr`
 --------
 - When should I use the --rsync-only option?
  By default, `repmgr` uses `pg_basebackup` to clone a standby from
  a master. However, `pg_basebackup` copies the entire data directory, which
  can take some time depending on installation size. If you have an
  existing but "stale" standby, `repmgr` can use `rsync` instead,
  which means only changed or added files need to be copied.
 - Can I register an existing master/standby?
  Yes, this is no problem.
 - How can a failed master be re-added as a standby?
  This is a two-stage process. First, the failed master's data directory
  must be re-synced with the current master; secondly the failed master
  needs to be re-registered as a standby. The section "Converting a failed
  master to a standby" in the `README.md` file contains more detailed
  information on this process.
 - Is there an easy way to check my master server is correctly configured
  for use with `repmgr`?
  Yes - execute `repmgr` with the `--check-upstream-config` option, and it
  will let you know which items in `postgresql.conf` need to be modified.
 - Even though I specified custom `rsync` options, `repmgr` appends
  the `--checksum` - why?
  When syncing a stale data directory from an active server, it's
  essential that `rsync` compares the content of files rather than
  just timestamp and size, to ensure that all changed files are
  copied and prevent corruption.
 - When cloning a standby, how can I prevent `repmgr` from copying
  `postgresql.conf` and `pg_hba.conf` from the PostgreSQL configuration
  directory in `/etc`?
  Use the command line option `--ignore-external-config-files`
 - How can I prevent `repmgr` from copying local configuration files
  in the data directory?
  If you're updating an existing but stale data directory which
  contains e.g. configuration files you don't want to be overwritten
  with the same file from the master, specify the files in the
  `rsync_options` configuration option, e.g.
      rsync_options=--exclude=postgresql.local.conf
  This option is only available when using the `--rsync-only` option.
 - How can I make the witness server use a particular port?
  By default the witness server is configured to use port 5499; this
  is intended to support running the witness server as  a separate
  instance on a normal node server, rather than on its own dedicated server.
  To specify different port for the witness server, supply the port number
  in the `conninfo` string in `repmgr.conf`
  (repmgr 3.0.1 and earlier: use the `-l/--local-port` option)
 - Do I need to include `shared_preload_libraries = 'repmgr_funcs'`
  in `postgresql.conf` if I'm not using `repmgrd`?
  No, the `repmgr_funcs` library is only needed when running `repmgrd`.
  If you later decide to run `repmgrd`, you just need to add
  `shared_preload_libraries = 'repmgr_funcs'` and restart PostgreSQL.
 - I've provided replication permission for the `repmgr` user in `pg_hba.conf`
  but `repmgr`/`repmgrd` complains it can't connect to the server... Why?
  `repmgr`/`repmgrd` need to be able to connect to the repmgr database
  with a normal connection to query metadata. The `replication` connection
  permission is for PostgreSQL's streaming replication and doesn't
  necessarily need to be the `repmgr` user.
 - When cloning a standby, why do I need to provide the connection parameters
  for the primary server on the command line, not in the configuration file?
  Cloning a standby is a one-time action; the role of the server being cloned
  from could change, so fixing it in the configuration file would create
  confusion. If `repmgr` needs to establish a connection to the primary
  server, it can retrieve this from the `repl_nodes` table or if necessary
  scan the replication cluster until it locates the active primary.
 - Why is there no foreign key on the `node_id` column in the `repl_events`
  table?
  Under some circumstances event notifications can be generated for servers
  which have not yet been registered; it's also useful to retain a record
  of events which includes servers removed from the replication cluster
  which no longer have an entry in the `repl_nodes` table.
 `repmgrd`
 ---------
 - Do I need a witness server?
  Not necessarily. However if you have an uneven number of nodes spread
  over more than one network segment, a witness server will enable
  better handling of a 'split brain' situation by providing a "casting
  vote" on the preferred network segment.
 - How can I prevent a node from ever being promoted to master?
  In `repmgr.conf`, set its priority to a value of 0 or less.
  Additionally, if `failover` is set to `manual`, the node will never
  be considered as a promotion candidate.
 - Does `repmgrd` support delayed standbys?
  `repmgrd` can monitor delayed standbys - those set up with
  `recovery_min_apply_delay` set to a non-zero value in `recovery.conf` -
  but as it's not currently possible to directly examine the value
  applied to the standby, `repmgrd` may not be able to properly evaluate
  the node as a promotion candidate.
  We recommend that delayed standbys are explicitly excluded from promotion
  by setting `priority` to 0 in `repmgr.conf`.
  Note that after registering a delayed standby, `repmgrd` will only start
  once the metadata added in the master node has been replicated.
 - How can I get `repmgrd` to rotate its logfile?
  Configure your system's `logrotate` service to do this; see example
  in README.md
 - I've recloned a failed master as a standby, but `repmgrd` refuses to start?
  Check you registered the standby after recloning. If unregistered the standby
  cannot be considered as a promotion candidate even if `failover` is set to
  `automatic`, which is probably not what you want. `repmgrd` will start if
  `failover` is set to `manual` so the node's replication status can still
  be monitored, if desired.
--- a/201
+++ b/201
@@ -1,196 +1,3 @@
 3.4.0   2019-02-
 		default log level is now INFO (Ian)
        repmgr: fix `standby register --force` when updating existing node record (Ian)
 		repmgrd: set LSN shared memory value at standby startup (Ian)
 		repmgrd: improve logging during failover (Ian)
 3.3.2   2017-06-01
        Add support for PostgreSQL 10 (Ian)
        repmgr: ensure --replication-user option is honoured when passing database
          connection parameters as a conninfo string (Ian)
        repmgr: improve detection of pg_rewind on remote server (Ian)
        repmgr: add DETAIL log output for additional clarification of error messages (Ian)
        repmgr: suppress various spurious error messages in `standby follow` and
          `standby switchover` (Ian)
        repmgr: add missing `-P` option (Ian)
        repmgrd: monitoring statistic reporting fixes (Ian)
 3.3.1   2017-03-13
        repmgrd: prevent invalid apply lag value being written to the
          monitoring table (Ian)
        repmgrd: fix error in XLogRecPtr conversion when calculating
          monitoring statistics (Ian)
        repmgr: if replication slots in use, where possible delete slot on old
          upstream node after following new upstream (Ian)
        repmgr: improve logging of rsync actions (Ian)
        repmgr: improve `standby clone` when synchronous replication in use (Ian)
        repmgr: stricter checking of allowed node id values
        repmgr: enable `master register --force` when there is a foreign key
          dependency from a standby node (Ian)
 3.3     2016-12-27
        repmgr: always log to STDERR even if log facility defined (Ian)
        repmgr: add --log-to-file to log repmgr output to the defined
          log facility (Ian)
        repmgr: improve handling of command line parameter errors (Ian)
        repmgr: add option --upstream-conninfo to explicitly set
          'primary_conninfo' in recovery.conf (Ian)
        repmgr: enable a standby to be registered which isn't running (Ian)
        repmgr: enable `standby register --force` to update a node record
          with cascaded downstream node records (Ian)
        repmgr: add option `--no-conninfo-password` (Abhijit, Ian)
        repmgr: add initial support for PostgreSQL 10.0 (Ian)
        repmgr: escape values in primary_conninfo if needed (Ian)
 3.2.1   2016-10-24
        repmgr: require a valid repmgr cluster name unless -F/--force
          supplied (Ian)
        repmgr: check master server is registered with repmgr before
          cloning (Ian)
        repmgr: ensure data directory defaults to that of the source node (Ian)
        repmgr: various fixes to Barman cloning mode (Gianni, Ian)
        repmgr: fix `repmgr cluster crosscheck` output (Ian)
 3.2     2016-10-05
        repmgr: add support for cloning from a Barman backup (Gianni)
        repmgr: add commands `standby matrix` and `standby crosscheck` (Gianni)
        repmgr: suppress connection error display in `repmgr cluster show`
          unless `--verbose` supplied (Ian)
        repmgr: add commands `witness register` and `witness unregister` (Ian)
        repmgr: enable `standby unregister` / `witness unregister` to be
          executed for a node which is not running (Ian)
        repmgr: remove deprecated command line options --initdb-no-pwprompt and
           -l/--local-port (Ian)
        repmgr: before cloning with pg_basebackup, check that sufficient free
           walsenders are available (Ian)
        repmgr: add option `--wait-sync` for `standby register` which causes
           repmgr to wait for the registered node record to synchronise to
           the standby (Ian)
        repmgr: add option `--copy-external-config-files` for files outside
           of the data directory (Ian)
        repmgr: only require `wal_keep_segments` to be set in certain corner
           cases (Ian)
        repmgr: better support cloning from a node other than the one to
           stream from (Ian)
        repmgrd: add configuration options to override the default pg_ctl
           commands (Jarkko Oranen, Ian)
        repmgrd: don't start if node is inactive and failover=automatic (Ian)
        packaging: improve "repmgr-auto" Debian package (Gianni)
 3.1.5   2016-08-15
        repmgrd: in a failover situation, prevent endless looping when
          attempting to establish the status of a node with
          `failover=manual` (Ian)
        repmgrd: improve handling of failover events on standbys with
          `failover=manual`, and create a new event notification
          for this, `standby_disconnect_manual` (Ian)
        repmgr: add further event notifications (Gianni)
        repmgr: when executing `standby switchover`, don't collect remote
          command output unless required (Gianni, Ian)
        repmgrd: improve standby monitoring query (Ian, based on suggestion
          from  Álvaro)
        repmgr: various command line handling improvements (Ian)
 3.1.4   2016-07-12
        repmgr: new configuration option for setting "restore_command"
          in the recovery.conf file generated by repmgr (Martín)
        repmgr: add --csv option to "repmgr cluster show" (Gianni)
        repmgr: enable provision of a conninfo string as the -d/--dbname
          parameter, similar to other PostgreSQL utilities (Ian)
        repmgr: during switchover operations improve detection of
          demotion candidate shutdown (Ian)
        various bugfixes and documentation updates (Ian, Martín)
 3.1.3   2016-05-17
        repmgrd: enable monitoring when a standby is catching up by
          replaying archived WAL (Ian)
        repmgrd: when upstream_node_id is NULL, assume upstream node
          to be current master (Ian)
        repmgrd: check for reappearance of the master node if standby
          promotion fails (Ian)
        improve handling of rsync failure conditions (Martín)
 3.1.2   2016-04-12
        Fix pg_ctl path generation in do_standby_switchover() (Ian)
        Regularly sync witness server repl_nodes table (Ian)
        Documentation improvements (Gianni, dhyannataraj)
        (Experimental) ensure repmgr handles failover slots when copying
          in rsync mode (Craig, Ian)
        rsync mode handling fixes (Martín)
        Enable repmgr to compile against 9.6devel (Ian)
 3.1.1   2016-02-24
        Add '-P/--pwprompt' option for "repmgr create witness" (Ian)
        Prevent repmgr/repmgrd running as root (Ian)
 3.1.0   2016-02-01
        Add "repmgr standby switchover" command (Ian)
        Revised README file (Ian)
        Remove requirement for 'archive_mode' to be enabled (Ian)
        Improve -?/--help output, showing default values if relevant (Ian)
        Various bugfixes to command line/configuration parameter handling (Ian)
 3.0.3   2016-01-04
        Create replication slot if required before base backup is run (Abhijit)
        standy clone: when using rsync, clean up "pg_replslot" directory (Ian)
        Improve --help output (Ian)
        Improve config file parsing (Ian)
        Various logging output improvements, including explicit HINTS (Ian)
        Add --log-level to explicitly set log level on command line (Ian)
        Repurpose --verbose to display extra log output (Ian)
        Add --terse to hide hints and other non-critical output (Ian)
        Reference internal functions with explicit catalog path (Ian)
        When following a new primary, have repmgr (not repmgrd) create the new slot (Ian)
        Add /etc/repmgr.conf as a default configuration file location (Ian)
        Prevent repmgrd's -v/--verbose option expecting a parameter (Ian)
        Prevent invalid replication_lag values being written to the monitoring table (Ian)
        Improve repmgrd behaviour when monitored standby node is temporarily
          unavailable (Martín)
 3.0.2   2015-10-02
        Improve handling of --help/--version options; and improve help output (Ian)
        Improve handling of situation where logfile can't be opened (Ian)
        Always pass -D/--pgdata option to pg_basebackup (Ian)
        Bugfix: standby clone --force does not empty pg_xlog (Gianni)
        Bugfix: autofailover with reconnect_attempts > 1 (Gianni)
        Bugfix: ignore comments after values (soxwellfb)
        Bugfix: handle string values in 'node' parameter correctly (Gregory Duchatelet)
        Allow repmgr to be compiled with a newer libpq (Marco)
        Bugfix: call update_node_record_set_upstream() for STANDBY FOLLOW (Tomas)
        Update `repmgr --help` output (per Github report from renard)
        Update tablespace remapping in --rsync-only mode for 9.5 and later (Ian)
        Deprecate `-l/--local-port` option - the port can be extracted
          from the conninfo string in repmgr.conf (Ian)
        Add STANDBY UNREGISTER (Vik Fearing)
        Don't fail with error when registering master if schema already defined (Ian)
        Fixes to whitespace handling when parsing config file (Ian)
 3.0.1   2015-04-16
        Prevent repmgrd from looping infinitely if node was not registered (Ian)
        When promoting a standby, have repmgr (not repmgrd) handle metadata updates (Ian)
        Re-use replication slot if it already exists (Ian)
        Prevent a test SSH connection being made when not needed (Ian)
        Correct monitoring table column names (Ian)
 3.0     2015-03-27
        Require PostgreSQL 9.3 or later (Ian)
        Use `pg_basebackup` by default (instead of `rsync`) to clone standby servers (Ian)
        Use `pg_ctl promote` to promote a standby to primary
        Enable tablespace remapping using `pg_basebackup` (in PostgreSQL 9.3 with `rsync`) (Ian)
        Support cascaded standbys (Ian)
        "pg_bindir" no longer required as a configuration parameter (Ian)
        Enable replication slots to be used (PostgreSQL 9.4 and later (Ian)
        Command line option "--check-upstream-config" (Ian)
        Add event logging table and option to execute an external program when an event occurs (Ian)
        General usability and logging message improvements (Ian)
        Code consolidation and cleanup (Ian)
 2.0.3   2015-04-16
        Add -S/--superuser option for witness database creation Ian)
        Add -c/--fast-checkpoint option for cloning (Christoph)
        Add option "--initdb-no-pwprompt" (Ian)
 2.0.2   2015-02-17
        Add "--checksum" in rsync when using "--force" (Jaime)
        Use createdb/createuser instead of psql (Jaime)
@@ -233,15 +40,15 @@
        Make the monitoring optional and turned off by default, it can be turned on with --monitoring-history switch (Jaime)
        Add tunables to specify number of retries to reconnect to master and the time between them (Jaime)
-1.2.0   2012-07-27
+1.2.0	2012-07-27
-        Test ssh connection before trying to rsync (Cédric)
+		Test ssh connection before trying to rsync (Cédric)
        Add CLUSTER SHOW command (Carlo)
        Add CLUSTER CLEANUP command (Jaime)
        Add function write_primary_conninfo (Marco)
        Teach repmgr how to get tablespace's location in different pg version (Jaime)
-        Improve version message (Carlo)
+		Improve version message (Carlo)
-1.1.1   2012-04-18
+1.1.1	2012-04-18
        Add --ignore-rsync-warning (Cédric)
        Add strnlen for compatibility with OS X (Greg)
        Improve performance of the repl_status view (Jaime)
--- a/59
+++ b/59
@@ -1,34 +1,24 @@
 #
 # Makefile
-# Copyright (c) 2ndQuadrant, 2010-2017
+# Copyright (c) 2ndQuadrant, 2010-2014
 HEADERS = $(wildcard *.h)
 repmgrd_OBJS = dbutils.o config.o repmgrd.o log.o strutil.o
-repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o dirmod.o compat.o
+repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o
 DATA = repmgr.sql uninstall_repmgr.sql
 REGRESS = repmgr_funcs repmgr_test
-PG_CPPFLAGS = -I$(includedir_internal) -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS     = $(libpq_pgport)
+PG_LIBS = $(libpq_pgport)
-
+all:  repmgrd repmgr
 all: repmgrd repmgr
 	$(MAKE) -C sql
 repmgrd: $(repmgrd_OBJS)
-	$(CC) -o repmgrd $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX)
+	$(CC) $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgrd
 	$(MAKE) -C sql
 repmgr: $(repmgr_OBJS)
-	$(CC) -o repmgr $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX)
+	$(CC) $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgr
 # Make all objects depend on all include files. This is a bit of a
 # shotgun approach, but the codebase is small enough that a complete rebuild
 # is very fast anyway.
 $(repmgr_OBJS): $(HEADERS)
 $(repmgrd_OBJS): $(HEADERS)
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -41,8 +31,8 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
-# XXX: This overrides the pgxs install target - we're building two binaries,
+# XXX: Try to use PROGRAM construct (see pgxs.mk) someday. Right now
-# which is not supported by pgxs.mk's PROGRAM construct.
+# is overriding pgxs install.
 install: install_prog install_ext
 install_prog:
@@ -53,12 +43,6 @@ install_prog:
 install_ext:
 	$(MAKE) -C sql install
 # Distribution-specific package building targets
 # ----------------------------------------------
 #
 # XXX we recommend using the PGDG-supplied packages where possible;
 # see README.md for details.
 install_rhel:
 	mkdir -p '$(DESTDIR)/etc/init.d/'
 	$(INSTALL_PROGRAM) RHEL/repmgrd.init '$(DESTDIR)/etc/init.d/repmgrd'
@@ -83,23 +67,16 @@ clean:
 	rm -f repmgr
 	$(MAKE) -C sql clean
 # Get correct version numbers and install paths, depending on your postgres version
 PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)
 REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
 PKGLIBDIR = $(shell pg_config --pkglibdir)
 SHAREDIR = $(shell pg_config --sharedir)
 PGBINDIR = /usr/lib/postgresql/$(PG_VERSION)/bin
 deb: repmgrd repmgr
-	mkdir -p ./debian/usr/bin ./debian$(PGBINDIR)
+	mkdir -p ./debian/usr/bin
-	cp repmgrd repmgr ./debian$(PGBINDIR)
+	cp repmgrd repmgr ./debian/usr/bin/
-	ln -s ../..$(PGBINDIR)/repmgr ./debian/usr/bin/repmgr
+	mkdir -p ./debian/usr/share/postgresql/9.0/contrib/
-	mkdir -p ./debian$(SHAREDIR)/contrib/
+	cp sql/repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+	cp sql/uninstall_repmgr_funcs.sql ./debian/usr/share/postgresql/9.0/contrib/
-	cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
+	mkdir -p ./debian/usr/lib/postgresql/9.0/lib/
-	mkdir -p ./debian$(PKGLIBDIR)/
+	cp sql/repmgr_funcs.so ./debian/usr/lib/postgresql/9.0/lib/
 	cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/
 	dpkg-deb --build debian
-	mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb
+	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb
 	rm -rf ./debian/usr
--- a/PACKAGES.md
+++ b/PACKAGES.md
@@ -1,127 +0,0 @@
 Packaging
 =========
 Notes on RedHat Linux, Fedora, and CentOS Builds
 ------------------------------------------------
 The RPM packages of PostgreSQL put `pg_config` into the `postgresql-devel`
 package, not the main server one.  And if you have a RPM install of PostgreSQL
 9.0, the entire PostgreSQL binary directory will not be in your PATH by default
 either.  Individual utilities are made available via the `alternatives`
 mechanism, but not all commands will be wrapped that way.  The files installed
 by repmgr will certainly not be in the default PATH for the postgres user
 on such a system.  They will instead be in /usr/pgsql-9.0/bin/ on this
 type of system.
 When building repmgr against a RPM packaged build, you may discover that some
 development packages are needed as well.  The following build errors can
 occur:
    /usr/bin/ld: cannot find -lxslt
    /usr/bin/ld: cannot find -lpam
 Install the following packages to correct those:
    yum install libxslt-devel
    yum install pam-devel
 If building repmgr as a regular user, then doing the install into the system
 directories using sudo, the syntax is hard.  `pg_config` won't be in root's
 path either.  The following recipe should work:
    sudo PATH="/usr/pgsql-9.0/bin:$PATH" make USE_PGXS=1 install
 Issues with 32 and 64 bit RPMs
 ------------------------------
 If when building, you receive a series of errors of this form:
  /usr/bin/ld: skipping incompatible /usr/pgsql-9.0/lib/libpq.so when searching for -lpq
 This is likely because you have both the 32 and 64 bit versions of the
 `postgresql90-devel` package installed.  You can check that like this:
    rpm -qa --queryformat '%{NAME}\t%{ARCH}\n'  | grep postgresql90-devel
 And if two packages appear, one for i386 and one for x86_64, that's not supposed
 to be allowed.
 This can happen when using the PGDG repo to install that package;
 here is an example sessions demonstrating the problem case appearing:
    # yum install postgresql-devel
    ..
    Setting up Install Process
    Resolving Dependencies
    --> Running transaction check
    ---> Package postgresql90-devel.i386 0:9.0.2-2PGDG.rhel5 set to be updated
    ---> Package postgresql90-devel.x86_64 0:9.0.2-2PGDG.rhel5 set to be updated
    --> Finished Dependency Resolution
    Dependencies Resolved
    =========================================================================
     Package               Arch      Version              Repository    Size
    =========================================================================
    Installing:
     postgresql90-devel    i386      9.0.2-2PGDG.rhel5    pgdg90        1.5 M
     postgresql90-devel    x86_64    9.0.2-2PGDG.rhel5    pgdg90        1.6 M
 Note how both the i386 and x86_64 platform architectures are selected for
 installation.  Your main PostgreSQL package will only be compatible with one of
 those, and if the repmgr build finds the wrong postgresql90-devel these
 "skipping incompatible" messages appear.
 In this case, you can temporarily remove both packages, then just install the
 correct one for your architecture.  Example:
    rpm -e postgresql90-devel --allmatches
    yum install postgresql90-devel-9.0.2-2PGDG.rhel5.x86_64
 Instead just deleting the package from the wrong platform might not leave behind
 the correct files, due to the way in which these accidentally happen to interact.
 If you already tried to build repmgr before doing this, you'll need to do:
    make USE_PGXS=1 clean
 to get rid of leftover files from the wrong architecture.
 Notes on Ubuntu, Debian or other Debian-based Builds
 ----------------------------------------------------
 The Debian packages of PostgreSQL put `pg_config` into the development package
 called `postgresql-server-dev-$version`.
 When building repmgr against a Debian packages build, you may discover that some
 development packages are needed as well. You will need the following development
 packages installed:
    sudo apt-get install libxslt-dev libxml2-dev libpam-dev libedit-dev
 If you're using Debian packages for PostgreSQL and are building repmgr with the
 USE_PGXS option you also need to install the corresponding development package:
    sudo apt-get install postgresql-server-dev-9.0
 If you build and install repmgr manually it will not be on the system path. The
 binaries will be installed in /usr/lib/postgresql/$version/bin/ which is not on
 the default path. The reason behind this is that Ubuntu/Debian systems manage
 multiple installed versions of PostgreSQL on the same system through a wrapper
 called pg_wrapper and repmgr is not (yet) known to this wrapper.
 You can solve this in many different ways, the most Debian like is to make an
 alternate for repmgr and repmgrd:
    sudo update-alternatives --install /usr/bin/repmgr repmgr /usr/lib/postgresql/9.0/bin/repmgr 10
    sudo update-alternatives --install /usr/bin/repmgrd repmgrd /usr/lib/postgresql/9.0/bin/repmgrd 10
 You can also make a deb package of repmgr using:
    make USE_PGXS=1 deb
 This will build a Debian package one level up from where you build, normally the
 same directory that you have your repmgr/ directory in.
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -1 +1,292 @@
-The contents of this file have been incorporated into the main README.md document.
+repmgr: Quickstart guide
 ========================
 repmgr is an open-source tool suite for mananaging replication and failover
 among multiple PostgreSQL server nodes. It enhances PostgreSQL's built-in
 hot-standby capabilities with a set of administration tools for monitoring
 replication, setting up standby servers and performing failover/switchover
 operations.
 This quickstart guide assumes you are familiar with PostgreSQL replication
 setup and Linux/UNIX system administration. For a more detailed tutorial
 covering setup on a variety of different systems, see the README.rst file.
 Conceptual Overview
 -------------------
 repmgr provides two binaries:
 - `repmgr`: a command-line client to manage replication and repmgr configuration
 - `repmgrd`: an optional daemon process which runs on standby nodes to monitor
   replication and node status
 Each PostgreSQL node requires a repmgr configuration file; additionally
 it must be "registered" using the repmgr command-line client. repmgr stores
 information about managed nodes in a custom schema on the node's current master
 database.
 Requirements
 ------------
 repmgr works with PostgreSQL 9.0 and later. All server nodes must be running the
 same PostgreSQL major version, and preferably should be running the same minor
 version.
 repmgr will work on any Linux or UNIX-like environment capable of running
 PostgreSQL. rsync must also be installed.
 Installation
 ------------
 repmgr must be installed on each PostgreSQL server node.
 * Packages
 - RPM packages for RedHat-based distributions are available from PGDG
 - Debian/Ubuntu provide .deb packages.
  It is also possible to build .deb packages directly from the repmgr source;
  see README.rst for further details.
 * Source installation
 - repmgr source code is hosted at github (https://github.com/2ndQuadrant/repmgr);
   tar.gz files can be downloaded from https://github.com/2ndQuadrant/repmgr/releases .
   repmgr can be built easily using PGXS:
   sudo make USE_PGXS=1 install
 Configuration
 -------------
 ### Server configuration
 Password-less SSH logins must be enabled for the database system user (typically `postgres`)
 between all server nodes to enable repmgr to copy required files.
 ### PostgreSQL configuration
 The master PostgreSQL node needs to be configured for replication with the
 following settings:
 	wal_level = 'hot_standby'      # minimal, archive, hot_standby, or logical
 	archive_mode = on              # allows archiving to be done
 	archive_command = 'cd .'       # command to use to archive a logfile segment
 	max_wal_senders = 10           # max number of walsender processes
 	wal_keep_segments = 5000       # in logfile segments, 16MB each; 0 disables
 	hot_standby = on               # "on" allows queries during recovery
 Note that repmgr expects a default of 5000 wal_keep_segments, although this
 value can be overridden when executing the `repmgr` client.
 Additionally, repmgr requires a dedicated PostgreSQL superuser account
 and a database in which to store monitoring and replication data. The repmgr
 user account will also be used for replication connections from the standby,
 so a seperate replication user with the `REPLICATION` privilege is not required.
 The database can in principle be any database, including the default `postgres`
 one, however it's probably advisable to create a dedicated database for repmgr
 usage.
 ### repmgr configuration
 Each PostgreSQL node requires a repmgr configuration file containing
 identification and database connection information:
  cluster=test
  node=1
  node_name=node1
  conninfo='host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
  pg_bindir=/path/to/postgres/bin
 * `cluster`: common name for the replication cluster; this must be the same on all nodes
 * `node`: a unique, abitrary integer identifier
 * `name`: a unique, human-readable name
 * `conninfo`: a standard conninfo string enabling repmgr to connect to the
   control database; user and name must be the same on all nodes, while other
   parameters such as port may differ. The `host` parameter *must* be a hostname
   resolvable by all nodes on the cluster.
 * `pg_bindir`: (optional) location of PostgreSQL binaries, if not in the default $PATH
 Note that the configuration file should not be stored inside the PostgreSQL
 data directory.
 Each node configuration needs to be registered with repmgr, either using the
 repmgr command line tool, or the repmgrd daemon; for details see below. Details
 about each node are inserted into the repmgr database (for details see below).
 Replication setup and monitoring
 --------------------------------
 For the purposes of this guide, we'll assume the database user will be
 `repmgr_usr` and the database will be `repmgr_db`, and that the following
 environment variables are set on each node:
 - $HOME: the PostgreSQL system user's home directory
 - $PGDATA: the PostgreSQL data directory
 Master setup
 ------------
 1. Configure PostgreSQL
  - create user and database:
 	```
 	CREATE ROLE repmgr_usr LOGIN SUPERUSER;
 	CREATE DATABASE repmgr_db OWNER repmgr_usr;
 	```
  - configure postgresql.conf for replication (see above)
  - update pg_hba.conf, e.g.:
 	```
 	host    repmgr_db       repmgr_usr  192.168.1.0/24         trust
 	host    replication     repmgr_usr  192.168.1.0/24         trust
 	```
  Restart the PostgreSQL server after making these changes.
 2. Create the repmgr configuration file:
    $ cat $HOME/repmgr/repmgr.conf
    cluster=test
    node=1
    node_name=node1
    conninfo='host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
    pg_bindir=/path/to/postgres/bin
 3. Register the master node with repmgr:
    $ repmgr -f $HOME/repmgr/repmgr.conf --verbose master register
    [2014-07-04 10:43:42] [INFO] repmgr mgr connecting to master database
    [2014-07-04 10:43:42] [INFO] repmgr connected to master, checking its state
    [2014-07-04 10:43:42] [INFO] master register: creating database objects inside the repmgr_test schema
    [2014-07-04 10:43:43] [NOTICE] Master node correctly registered for cluster test with id 1 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
 Slave/standby setup
 -------------------
 1. Use repmgr to clone the master:
    $ repmgr -f $HOME/repmgr/repmgr.conf -D $PGDATA -d repmgr_db -U repmgr_usr -R postgres --verbose standby clone 192.168.1.2
    Opening configuration file: ./repmgr.conf
    [2014-07-04 10:49:00] [ERROR] Did not find the configuration file './repmgr.conf', continuing
    [2014-07-04 10:49:00] [INFO] repmgr connecting to master database
    [2014-07-04 10:49:00] [INFO] repmgr connected to master, checking its state
    [2014-07-04 10:49:00] [INFO] Successfully connected to primary. Current installation size is 1807 MB
    [2014-07-04 10:49:00] [NOTICE] Starting backup...
    [2014-07-04 10:49:00] [INFO] creating directory "/path/to/data/"...
    (...)
    [2014-07-04 10:53:19] [NOTICE] Finishing backup...
    NOTICE:  pg_stop_backup complete, all required WAL segments have been archived
    [2014-07-04 10:53:21] [INFO] repmgr requires primary to keep WAL files 0000000100000000000000AD until at least 0000000100000000000000AD
    [2014-07-04 10:53:21] [NOTICE] repmgr standby clone complete
    [2014-07-04 10:53:21] [NOTICE] HINT: You can now start your postgresql server
    [2014-07-04 10:53:21] [NOTICE] for example : /etc/init.d/postgresql start
  -R is the database system user on the master node. At this point it does not matter
  if the `repmgr.conf` file is not found.
  This will clone the PostgreSQL database files from the master, including its
  `postgresql.conf` and `pg_hba.conf` files, and additionally automatically create
  the `recovery.conf` file containing the correct parameters to start streaming
  from the primary node.
 2. Start the PostgreSQL server
 3. Create the repmgr configuration file:
    $ cat $HOME/repmgr/repmgr.conf
    cluster=test
    node=2
    node_name=node2
    conninfo='host=repmgr_node2 user=repmgr_usr dbname=repmgr_db'
    pg_bindir=/path/to/postgres/bin
 4. Register the master node with repmgr:
    $ repmgr -f $HOME/repmgr/repmgr.conf --verbose standby register
    Opening configuration file: /path/to/repmgr/repmgr.conf
    [2014-07-04 11:48:13] [INFO] repmgr connecting to standby database
    [2014-07-04 11:48:13] [INFO] repmgr connected to standby, checking its state
    [2014-07-04 11:48:13] [INFO] repmgr connecting to master database
    [2014-07-04 11:48:13] [INFO] finding node list for cluster 'test'
    [2014-07-04 11:48:13] [INFO] checking role of cluster node 'host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
    [2014-07-04 11:48:13] [INFO] repmgr connected to master, checking its state
    [2014-07-04 11:48:13] [INFO] repmgr registering the standby
    [2014-07-04 11:48:13] [INFO] repmgr registering the standby complete
    [2014-07-04 11:48:13] [NOTICE] Standby node correctly registered for cluster test with id 2 (conninfo: host=localhost user=repmgr_usr dbname=repmgr_db)
 Monitoring
 ----------
 `repmgrd` is a management and monitoring daemon which runs on standby nodes
 and which and can automate remote actions. It can be started simply with e.g.:
    repmgrd -f $HOME/repmgr/repmgr.conf --verbose > $HOME/repmgr/repmgr.log 2>&1
 or alternatively:
    repmgrd -f $HOME/repmgr/repmgr.conf --verbose --monitoring-history > $HOME/repmgr/repmgrd.log 2>&1
 which will track advance or lag of the replication in every standby in the
 `repl_monitor` table.
 Example log output:
    [2014-07-04 11:55:17] [INFO] repmgrd Connecting to database 'host=localhost user=repmgr_usr dbname=repmgr_db'
    [2014-07-04 11:55:17] [INFO] repmgrd Connected to database, checking its state
    [2014-07-04 11:55:17] [INFO] repmgrd Connecting to primary for cluster 'test'
    [2014-07-04 11:55:17] [INFO] finding node list for cluster 'test'
    [2014-07-04 11:55:17] [INFO] checking role of cluster node 'host=repmgr_node1 user=repmgr_usr dbname=repmgr_db'
    [2014-07-04 11:55:17] [INFO] repmgrd Checking cluster configuration with schema 'repmgr_test'
    [2014-07-04 11:55:17] [INFO] repmgrd Checking node 2 in cluster 'test'
    [2014-07-04 11:55:17] [INFO] Reloading configuration file and updating repmgr tables
    [2014-07-04 11:55:17] [INFO] repmgrd Starting continuous standby node monitoring
 Failover
 --------
 To promote a standby to master, on the standby execute e.g.:
    repmgr -f  $HOME/repmgr/repmgr.conf --verbose standby promote
 repmgr will attempt to connect to the current master to verify that it
 is not available (if it is, repmgr will not promote the standby).
 Other standby servers need to be told to follow the new master with:
    repmgr -f  $HOME/repmgr/repmgr.conf --verbose standby follow
 See file `autofailover_quick_setup.rst` for details on setting up
 automated failover.
 repmgr database schema
 ----------------------
 repmgr creates a small schema for its own use in the database specified in
 each node's conninfo configuration parameter. This database can in principle
 be any database. The schema name is the global `cluster` name prefixed
 with `repmgr_`, so for the example setup above the schema name is
 `repmgr_test`.
 The schema contains two tables:
 * `repl_nodes`
  stores information about all registered servers in the cluster
 * `repl_monitor`
  stores monitoring information about each node
 and one view, `repl_status`, which summarizes the latest monitoring information
 for each node.
--- a/README.md
+++ b/README.md
--- a/README.rst
+++ b/README.rst
--- a/RHEL/repmgr.spec
+++ b/RHEL/repmgr.spec
@@ -0,0 +1,57 @@
 Summary: repmgr
 Name: repmgr
 Version: 2.0
 Release: 2
 License: GPLv3
 Group: System Environment/Daemons
 URL: http://repmgr.org 
 Packager: Nathan Van Overloop <nathan.van.overloop@nexperteam.be>
 Vendor: 2ndQuadrant Limited
 Distribution: centos
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %description
 repmgr for centos6
 %prep
 %setup
 %build
 export PATH=$PATH:/usr/pgsql-9.3/bin/
 %{__make} USE_PGXS=1
 %install
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 export PATH=$PATH:/usr/pgsql-9.3/bin/
 %{__make} USE_PGXS=1 install DESTDIR=%{buildroot} INSTALL="install -p"
 %{__make} USE_PGXS=1 install_prog DESTDIR=%{buildroot} INSTALL="install -p"
 %{__make} USE_PGXS=1 install_rhel DESTDIR=%{buildroot} INSTALL="install -p"
 %clean
 [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
 %files
 %defattr(-,root,root)
 /usr/bin/repmgr
 /usr/bin/repmgrd
 /usr/pgsql-9.3/bin/repmgr
 /usr/pgsql-9.3/bin/repmgrd
 /usr/pgsql-9.3/lib/repmgr_funcs.so
 /usr/pgsql-9.3/share/contrib/repmgr.sql
 /usr/pgsql-9.3/share/contrib/repmgr_funcs.sql
 /usr/pgsql-9.3/share/contrib/uninstall_repmgr.sql
 /usr/pgsql-9.3/share/contrib/uninstall_repmgr_funcs.sql
 %attr(0755,root,root)/etc/init.d/repmgrd 
 %attr(0644,root,root)/etc/sysconfig/repmgrd
 %attr(0644,root,root)/etc/repmgr/repmgr.conf.sample
 %changelog
 * Thu Jun 05 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.2
 - fix witness creation to create db and user if needed
 * Fri Apr 04 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.1
 - initial build for RHEL6
--- a/RHEL/repmgrd.init
+++ b/RHEL/repmgrd.init
@@ -0,0 +1,114 @@
 #!/bin/bash
 #
 # repmgrd	Start up the repmgrd daemon
 #		repmrgd (replication manager daemon)
 #
 # chkconfig: -  75 16
 # description: repmgrd is the repliation manager daemon \
 # The repmgrd replication management and monitoring daemon for PostgreSQL.
 ### BEGIN INIT INFO
 # Provides: repmgrd
 # Required-Start:  $local_fs $remote_fs $network $syslog postgresql
 # Required-Stop:     $local_fs $remote_fs $network $syslog postgresql
 # Should-Start:	     $syslog postgresql-9.3
 # Should-Stop: $syslog postgresql-9.3
 # Short-Description: start and stop repmrgd
 # Description: Enable repmgrd replication management and monitoring daemon for PostgreSQL
 #	       this is used to monitor a postgresql cluster.
 ### END INIT INFO
 # Source function library.
 . /etc/init.d/functions
 # Source networking configuration.
 . /etc/sysconfig/network
 prog=repmgrd
 REPMGRD_ENABLED=yes
 REPMGRD_OPTS=
 REPMGRD_USER=postgres
 DAEMONIZE="-d"
 # pull in sysconfig settings
 [ -f /etc/sysconfig/repmgrd ] && . /etc/sysconfig/repmgrd
 LOCKFILE=/var/lock/subsys/$prog
 RETVAL=0
 case "$REPMGRD_ENABLED" in
    [Yy]*)
 	#nothing to do here	
 	;;
    *)
 	exit 2
 	;;
 esac
 if [ -z "$REPMGRD_OPTS" ]
 then
    echo "Not starting $prog, REPMGRD_OPTS not set in /etc/sysconfig/$prog"
    exit 2
 fi
 start() {
 	[ "$EUID" != "0" ] && exit 4
        [ "$NETWORKING" = "no" ] && exit 1
        # Start daemons.
        echo -n $"Starting $prog: "
        daemon --user $REPMGRD_USER $prog $DAEMONIZE $REPMGRD_OPTS
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch $LOCKFILE
        return $RETVAL
 }
 stop() {
 	[ "$EUID" != "0" ] && exit 4
        echo -n $"Shutting down $prog: "
        killproc $prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
        return $RETVAL
 }
 status() {
        if [ -f "$LOCKFILE" ]; then
            echo "$prog is running"
        else
 	    RETVAL=3
            echo "$prog is stopped"
        fi
        return $RETVAL
 }
 # See how we were called.
 case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  status)
        status $prog
        ;;
  restart|force-reload)
        stop
        start
        ;;
  try-restart|condrestart)
        if status $prog > /dev/null; then
            stop
            start
        fi
        ;;
  reload)
        exit 3
        ;;
  *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
        exit 2
 esac
--- a/RHEL/repmgrd.sysconfig
+++ b/RHEL/repmgrd.sysconfig
@@ -0,0 +1,4 @@
 #default sysconfig file for repmrgd
 #custom overrides can be placed here
 REPMGRD_OPTS="-f /etc/repmgr/repmgr.conf"
--- a/SSH-RSYNC.md
+++ b/SSH-RSYNC.md
@@ -1,36 +0,0 @@
 Set up trusted copy between postgres accounts
 ---------------------------------------------
 If you need to use `rsync` to clone standby servers, the `postgres` account
 on your primary and standby servers must be each able to access the other
 using SSH without a password.
 First generate an ssh key, using an empty passphrase, and copy the resulting
 keys and a matching authorization file to a privileged user account on the other
 system:
    [postgres@node1]$ ssh-keygen -t rsa
    Generating public/private rsa key pair.
    Enter file in which to save the key (/var/lib/pgsql/.ssh/id_rsa):
    Enter passphrase (empty for no passphrase):
    Enter same passphrase again:
    Your identification has been saved in /var/lib/pgsql/.ssh/id_rsa.
    Your public key has been saved in /var/lib/pgsql/.ssh/id_rsa.pub.
    The key fingerprint is:
    aa:bb:cc:dd:ee:ff:aa:11:22:33:44:55:66:77:88:99 postgres@db1.domain.com
    [postgres@node1]$ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
    [postgres@node1]$ chmod go-rwx ~/.ssh/*
    [postgres@node1]$ cd ~/.ssh
    [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys user@node2:
 Login as a user on the other system, and install the files into the `postgres`
 user's account:
    [user@node2 ~]$ sudo chown postgres.postgres authorized_keys id_rsa.pub id_rsa
    [user@node2 ~]$ sudo mkdir -p ~postgres/.ssh
    [user@node2 ~]$ sudo chown postgres.postgres ~postgres/.ssh
    [user@node2 ~]$ sudo mv authorized_keys id_rsa.pub id_rsa ~postgres/.ssh
    [user@node2 ~]$ sudo chmod -R go-rwx ~postgres/.ssh
 Now test that ssh in both directions works.  You may have to accept some new
 known hosts in the process.
--- a/58
+++ b/58
@@ -5,15 +5,10 @@ Known issues in repmgr
  the database server using the ``pg_ctl`` command may accidentally
  terminate after their associated ssh session ends.
 * PGPASSFILE may not be passed to pg_basebackup
 Planned feature improvements
 ============================
-* Use 'primary' instead of 'master' in documentation and log output
+* Timeline increases when promoting a standby
  for consistency with PostgreSQL documentation. See also commit
  870b0a53b627eeb9aca1fc14cbafe25b5beafe12.
 * A better check which standby did receive most of the data
@@ -21,54 +16,3 @@ Planned feature improvements
  algorithm
 * include support for delayed standbys
 * Create the repmgr user/database on "master register".
 * Use pg_basebackup for the data directory, and ALSO rsync for the
  configuration files.
 * If no configuration file supplied, search in sensible default locations
  (currently: current directory and `pg_config --sysconfdir`); if
  possible this should include the location provided by the package,
  if installed.
 * repmgrd: if connection to the upstream node fails on startup, optionally
  retry for a certain period before giving up; this will cover cases when
  e.g. primary and standby are both starting up, and the standby comes up
  before the primary. See github issue #80.
 * make old master node ID available for event notification commands
  (See github issue #80).
 * repmgr standby clone: possibility to use barman instead of performing a new base backup
 * possibility to transform a failed master into a new standby with pg_rewind
 * "repmgr standby switchover" to promote a standby in a controlled manner
   and convert the existing primary into a standby
 * make repmgrd more robust
 * repmgr: when cloning a standby using pg_basebackup and replication slots are
  requested, activate the replication slot using pg_receivexlog to negate the
  need to set `wal_keep_segments` just for the initial clone (9.4 and 9.5).
 * repmgr: enable "standby follow" to point a standby at another standby, not
  just the replication cluster master (see GitHub #130)
 Usability improvements
 ======================
 * repmgr: add interrupt handler, so that if the program is interrupted
  while running a backup, an attempt can be made to execute pg_stop_backup()
  on the primary, to prevent an orphaned backup state existing.
 * repmgr: when unregistering a node, delete any entries in the repl_monitoring
  table.
 * repmgr: for "standby unregister", accept connection parameters for the
  primary and perform metadata updates (and slot removal) directly on
  the primary, to allow a shutdown standby to be unregistered
  (currently the standby must still be running, which means the replication
  slot can't be dropped).
--- a/autofailover_quick_setup.rst
+++ b/autofailover_quick_setup.rst
@@ -0,0 +1,225 @@
 =====================================================
 PostgreSQL Automatic Fail-Over - User Documentation
 =====================================================
 Automatic Failover
 ==================
 repmgr allows setups for automatic failover when it detects the failure of the master node.
 Following is a quick setup for this.
 Installation
 ============
 For convenience, we define:
 **node1**
    is the hostname fully qualified of the Master server, IP 192.168.1.10
 **node2**
    is the hostname fully qualified of the Standby server, IP 192.168.1.11
 **witness**
    is the hostname fully qualified of the server used for witness, IP 192.168.1.12
 **Note:** It is not recommanded to use name defining status of a server like «masterserver»,
 this is a name leading to confusion once a failover take place and the Master is
 now on the «standbyserver».
 Summary
 -------
 2 PostgreSQL servers are involved in the replication.  Automatic fail-over need
 to vote to decide what server it should promote, thus an odd number is required
 and a witness-repmgrd is installed in a third server where it uses a PostgreSQL
 cluster to communicate with other repmgrd daemons.
 1. Install PostgreSQL in all the servers involved (including the server used for
   witness)
 2. Install repmgr in all the servers involved (including the server used for witness)
 3. Configure the Master PostreSQL
 4. Clone the Master to the Standby using "repmgr standby clone" command
 5. Configure repmgr in all the servers involved (including the server used for witness)
 6. Register Master and Standby nodes
 7. Initiate witness server
 8. Start the repmgrd daemons in all nodes
 **Note** A complete High-Availability design needs at least 3 servers to still have
 a backup node after a first failure.
 Install PostgreSQL
 ------------------
 You can install PostgreSQL using any of the recommended methods. You should ensure
 it's 9.0 or later.
 Install repmgr
 --------------
 Install repmgr following the steps in the README file.
 Configure PostreSQL
 -------------------
 Log in node1.
 Edit the file postgresql.conf and modify the parameters::
  listen_addresses='*'
  wal_level = 'hot_standby'
  archive_mode = on
  archive_command = 'cd .'	 # we can also use exit 0, anything that
                             # just does nothing
  max_wal_senders = 10
  wal_keep_segments = 5000   # 80 GB required on pg_xlog
  hot_standby = on
  shared_preload_libraries = 'repmgr_funcs'
 Edit the file pg_hba.conf and add lines for the replication::
  host     repmgr           repmgr      127.0.0.1/32            trust
  host     repmgr           repmgr      192.168.1.10/30         trust
  host     replication      all         192.168.1.10/30         trust
 **Note:** It is also possible to use a password authentication (md5), .pgpass file
 should be edited to allow connection between each node.
 Create the user and database to manage replication::
  su - postgres
  createuser -s repmgr
  createdb -O repmgr repmgr
  psql -f /usr/share/postgresql/9.0/contrib/repmgr_funcs.sql repmgr
 Restart the PostgreSQL server::
  pg_ctl -D $PGDATA restart
 And check everything is fine in the server log.
 Create the ssh-key for the postgres user and copy it to other servers::
  su - postgres
  ssh-keygen             # /!\ do not use a passphrase /!\
  cat ~/.ssh/id_rsa.pub > ~/.ssh/authorized_keys
  chmod 600 ~/.ssh/authorized_keys
  exit
  rsync -avz ~postgres/.ssh/authorized_keys node2:~postgres/.ssh/
  rsync -avz ~postgres/.ssh/authorized_keys witness:~postgres/.ssh/
  rsync -avz ~postgres/.ssh/id_rsa* node2:~postgres/.ssh/
  rsync -avz ~postgres/.ssh/id_rsa* witness:~postgres/.ssh/
 Clone Master
 ------------
 Log in node2.
 Clone the node1 (the current Master)::
  su - postgres
  repmgr -d repmgr -U repmgr -h node1 standby clone 
 Start the PostgreSQL server::
  pg_ctl -D $PGDATA start
 And check everything is fine in the server log.
 Configure repmgr
 ----------------
 Log in each server and configure repmgr by editing the file
 /etc/repmgr/repmgr.conf::
  cluster=my_cluster
  node=1
  node_name=earth
  conninfo='host=192.168.1.10 dbname=repmgr user=repmgr'
  master_response_timeout=60
  reconnect_attempts=6
  reconnect_interval=10
  failover=automatic
  promote_command='promote_command.sh'
  follow_command='repmgr standby follow -f /etc/repmgr/repmgr.conf'
 **cluster**
    is the name of the current replication.
 **node**
    is the number of the current node (1, 2 or 3 in the current example).
 **node_name**
    is an identifier for every node.
 **conninfo**
    is used to connect to the local PostgreSQL server (where the configuration file is) from any node. In the witness server configuration it is needed to add a 'port=5499' to the conninfo.
 **master_response_timeout**
    is the maximum amount of time we are going to wait before deciding the master has died and start failover procedure.
 **reconnect_attempts**
    is the number of times we will try to reconnect to master after a failure has been detected and before start failover procedure.
 **reconnect_interval**
    is the amount of time between retries to reconnect to master after a failure has been detected and before start failover procedure.
 **failover**
    configure behavior: *manual* or *automatic*.
 **promote_command**
    the command executed to do the failover (including the PostgreSQL failover itself). The command must return 0 on success.
 **follow_command**
    the command executed to address the current standby to another Master. The command must return 0 on success.
 Register Master and Standby
 ---------------------------
 Log in node1.
 Register the node as Master::
  su - postgres
  repmgr -f /etc/repmgr/repmgr.conf master register
 Log in node2. Register it as a standby::
  su - postgres
  repmgr -f /etc/repmgr/repmgr.conf standby register
 Initialize witness server
 -------------------------
 Log in witness.
 Initialize the witness server::
  su - postgres
  repmgr -d repmgr -U repmgr -h 192.168.1.10 -D $WITNESS_PGDATA -f /etc/repmgr/repmgr.conf witness create
 It needs information to connect to the master to copy the configuration of the cluster, also it needs to know where it should initialize it's own $PGDATA.
 As part of the procees it also ask for the superuser password so it can connect when needed.
 Start the repmgrd daemons
 -------------------------
 Log in node2 and witness.
 	su - postgres
 	repmgrd -f /etc/repmgr/repmgr.conf > /var/log/postgresql/repmgr.log 2>&1
 **Note:** The Master does not need a repmgrd daemon.
 Suspend Automatic behavior
 ==========================
 Edit the repmgr.conf of the node to remove from automatic processing and change::
 	failover=manual
 Then, signal repmgrd daemon::
 	su - postgres
 	kill -HUP `pidof repmgrd`
 Usage
 =====
 The repmgr documentation is in the README file (how to build, options, etc.)
--- a/check_dir.c
+++ b/check_dir.c
@@ -1,6 +1,6 @@
 /*
 * check_dir.c - Directories management functions
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,19 +23,14 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <ftw.h>
 /* NB: postgres_fe must be included BEFORE check_dir */
-#include <libpq-fe.h>
+#include "postgres_fe.h"
 #include <postgres_fe.h>
 #include "check_dir.h"
 #include "strutil.h"
 #include "log.h"
 static bool _create_pg_dir(char *dir, bool force, bool for_witness);
 static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
 /*
 * make sure the directory either doesn't exist or is empty
 * we use this function to check the new data directory and
@@ -103,7 +98,7 @@ create_dir(char *dir)
 	if (mkdir_p(dir, 0700) == 0)
 		return true;
-	log_err(_("unable to create directory \"%s\": %s\n"),
+	log_err(_("Could not create directory \"%s\": %s\n"),
 			dir, strerror(errno));
 	return false;
@@ -248,19 +243,6 @@ is_pg_dir(char *dir)
 bool
 create_pg_dir(char *dir, bool force)
 {
 	return _create_pg_dir(dir, force, false);
 }
 bool
 create_witness_pg_dir(char *dir, bool force)
 {
 	return _create_pg_dir(dir, force, true);
 }
 static bool
 _create_pg_dir(char *dir, bool force, bool for_witness)
 {
 	bool		pg_dir = false;
@@ -273,7 +255,7 @@ _create_pg_dir(char *dir, bool force, bool for_witness)
 			if (!create_dir(dir))
 			{
-				log_err(_("unable to create directory \"%s\"...\n"),
+				log_err(_("couldn't create directory \"%s\"...\n"),
 						dir);
 				return false;
 			}
@@ -285,7 +267,7 @@ _create_pg_dir(char *dir, bool force, bool for_witness)
 			if (!set_dir_permissions(dir))
 			{
-				log_err(_("unable to change permissions of directory \"%s\": %s\n"),
+				log_err(_("could not change permissions of directory \"%s\": %s\n"),
 						dir, strerror(errno));
 				return false;
 			}
@@ -297,33 +279,21 @@ _create_pg_dir(char *dir, bool force, bool for_witness)
 			pg_dir = is_pg_dir(dir);
-
+			/*
 			 * we use force to reduce the time needed to restore a node which
 			 * turn async after a failover or anything else
 			 */
 			if (pg_dir && force)
 			{
 				/*
 				 * The witness server does not store any data other than a copy of the
 				 * repmgr metadata, so in --force mode we can simply overwrite the
 				 * directory.
 				 *
 				 * For non-witness servers, we'll leave the data in place, both to reduce
 				 * the risk of unintentional data loss and to make it possible for the
 				 * data directory to be brought up-to-date with rsync.
 				 */
 				if (for_witness)
 				{
 					log_notice(_("deleting existing data directory \"%s\"\n"), dir);
 					nftw(dir, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
 				}
 				/* Let it continue */
 				break;
 			}
 			else if (pg_dir && !force)
 			{
-				log_hint(_("This looks like a PostgreSQL directory.\n"
+				log_warning(_("\nThis looks like a PostgreSQL directory.\n"
-							"If you are sure you want to clone here, "
+							  "If you are sure you want to clone here, "
-							"please check there is no PostgreSQL server "
+							  "please check there is no PostgreSQL server "
-							"running and use the -F/--force option\n"));
+							  "running and use the --force option\n"));
 				return false;
 			}
@@ -336,14 +306,3 @@ _create_pg_dir(char *dir, bool force, bool for_witness)
 	}
 	return true;
 }
 static int
 unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
 {
    int rv = remove(fpath);
    if (rv)
        perror(fpath);
    return rv;
 }
--- a/check_dir.h
+++ b/check_dir.h
@@ -1,6 +1,6 @@
 /*
 * check_dir.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,5 @@ bool		create_dir(char *dir);
 bool		set_dir_permissions(char *dir);
 bool		is_pg_dir(char *dir);
 bool		create_pg_dir(char *dir, bool force);
 bool		create_witness_pg_dir(char *dir, bool force);
 #endif
--- a/compat.c
+++ b/compat.c
@@ -1,107 +0,0 @@
 /*
 *
 * compat.c
 *	  Provides a couple of useful string utility functions adapted
 *	  from the backend code, which are not publicly exposed. They're
 *	  unlikely to change but it would be worth keeping an eye on them
 *	  for any fixes/improvements
 *
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #include "repmgr.h"
 #include "compat.h"
 /*
 * Append the given string to the buffer, with suitable quoting for passing
 * the string as a value, in a keyword/pair value in a libpq connection
 * string
 *
 * This function is adapted from src/fe_utils/string_utils.c (before 9.6
 * located in: src/bin/pg_dump/dumputils.c)
 */
 void
 appendConnStrVal(PQExpBuffer buf, const char *str)
 {
 	const char *s;
 	bool		needquotes;
 	/*
 	 * If the string is one or more plain ASCII characters, no need to quote
 	 * it. This is quite conservative, but better safe than sorry.
 	 */
 	needquotes = true;
 	for (s = str; *s; s++)
 	{
 		if (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||
 			  (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))
 		{
 			needquotes = true;
 			break;
 		}
 		needquotes = false;
 	}
 	if (needquotes)
 	{
 		appendPQExpBufferChar(buf, '\'');
 		while (*str)
 		{
 			/* ' and \ must be escaped by to \' and \\ */
 			if (*str == '\'' || *str == '\\')
 				appendPQExpBufferChar(buf, '\\');
 			appendPQExpBufferChar(buf, *str);
 			str++;
 		}
 		appendPQExpBufferChar(buf, '\'');
 	}
 	else
 		appendPQExpBufferStr(buf, str);
 }
 /*
 * Adapted from: src/fe_utils/string_utils.c
 */
 void
 appendShellString(PQExpBuffer buf, const char *str)
 {
 	const char *p;
 	appendPQExpBufferChar(buf, '\'');
 	for (p = str; *p; p++)
 	{
 		if (*p == '\n' || *p == '\r')
 		{
 			fprintf(stderr,
 					_("shell command argument contains a newline or carriage return: \"%s\"\n"),
 					str);
 			exit(ERR_BAD_CONFIG);
 		}
 		if (*p == '\'')
 			appendPQExpBufferStr(buf, "'\"'\"'");
 		else
 			appendPQExpBufferChar(buf, *p);
 	}
 	appendPQExpBufferChar(buf, '\'');
 }
--- a/compat.h
+++ b/compat.h
@@ -1,29 +0,0 @@
 /*
 * compat.h
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #ifndef _COMPAT_H_
 #define _COMPAT_H_
 extern void
 appendConnStrVal(PQExpBuffer buf, const char *str);
 extern void
 appendShellString(PQExpBuffer buf, const char *str);
 #endif
--- a/config.c
+++ b/config.c
--- a/config.h
+++ b/config.h
@@ -1,7 +1,6 @@
 /*
 * config.h
- *
+ * Copyright (c) 2ndQuadrant, 2010-2014
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,127 +20,38 @@
 #ifndef _REPMGR_CONFIG_H_
 #define _REPMGR_CONFIG_H_
-#include "postgres_fe.h"
+#include "repmgr.h"
 #include "strutil.h"
 #define CONFIG_FILE_NAME	"repmgr.conf"
 typedef struct EventNotificationListCell
 {
 	struct EventNotificationListCell *next;
 	char event_type[MAXLEN];
 } EventNotificationListCell;
 typedef struct EventNotificationList
 {
 	EventNotificationListCell *head;
 	EventNotificationListCell *tail;
 } EventNotificationList;
 typedef struct TablespaceListCell
 {
 	struct TablespaceListCell *next;
 	char		old_dir[MAXPGPATH];
 	char		new_dir[MAXPGPATH];
 } TablespaceListCell;
 typedef struct TablespaceList
 {
 	TablespaceListCell *head;
 	TablespaceListCell *tail;
 } TablespaceList;
 typedef struct
 {
 	char		cluster_name[MAXLEN];
 	int			node;
 	int         upstream_node;
 	char		conninfo[MAXLEN];
 	char		barman_server[MAXLEN];
 	char		barman_config[MAXLEN];
 	int			failover;
 	int			priority;
 	char		node_name[MAXLEN];
 	/* commands executed by repmgrd */
 	char		promote_command[MAXLEN];
 	char		follow_command[MAXLEN];
 	/* Overrides for pg_ctl commands */
 	char		service_stop_command[MAXLEN];
 	char		service_start_command[MAXLEN];
 	char		service_restart_command[MAXLEN];
 	char		service_reload_command[MAXLEN];
 	char		service_promote_command[MAXLEN];
 	char		loglevel[MAXLEN];
 	char		logfacility[MAXLEN];
 	char		rsync_options[QUERY_STR_LEN];
 	char		ssh_options[QUERY_STR_LEN];
 	int			master_response_timeout;
 	int			reconnect_attempts;
-	int			reconnect_interval;
+	int			reconnect_intvl;
 	char		pg_bindir[MAXLEN];
-	char		pg_ctl_options[MAXLEN];
+	char		pgctl_options[MAXLEN];
 	char		pg_basebackup_options[MAXLEN];
 	char		restore_command[MAXLEN];
 	char		logfile[MAXLEN];
 	int			monitor_interval_secs;
 	int			retry_promote_interval_secs;
 	int			witness_repl_nodes_sync_interval_secs;
 	int			use_replication_slots;
 	char		event_notification_command[MAXLEN];
 	EventNotificationList event_notifications;
 	TablespaceList tablespace_mapping;
 }	t_configuration_options;
-/*
+#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", 0, 0 }
 * The following will initialize the structure with a minimal set of options;
 * actual defaults are set in parse_config() before parsing the configuration file
 */
 #define T_CONFIGURATION_OPTIONS_INITIALIZER { "", UNKNOWN_NODE_ID, NO_UPSTREAM_NODE, "", "", "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", "", 0, 0, 0, 0, "", { NULL, NULL }, { NULL, NULL } }
 typedef struct ItemListCell
 {
 	struct ItemListCell *next;
 	char			    *string;
 } ItemListCell;
 typedef struct ItemList
 {
 	ItemListCell *head;
 	ItemListCell *tail;
 } ItemList;
 typedef struct TablespaceDataListCell
 {
 	struct TablespaceDataListCell *next;
 	char	   *name;
 	char	   *oid;
 	char	   *location;
 	/* optional payload */
 	FILE       *f;
 } TablespaceDataListCell;
 typedef struct TablespaceDataList
 {
 	TablespaceDataListCell *head;
 	TablespaceDataListCell *tail;
 } TablespaceDataList;
 void set_progname(const char *argv0);
 const char * progname(void);
 bool		load_config(const char *config_file, bool verbose, t_configuration_options *options, char *argv0);
 void		_parse_config(t_configuration_options *options, ItemList *error_list);
 bool		parse_config(t_configuration_options *options);
 bool		reload_config(t_configuration_options *orig_options);
 void		parse_config(const char *config_file, t_configuration_options * options);
 void		parse_line(char *buff, char *name, char *value);
 char	   *trim(char *s);
-void		item_list_append(ItemList *item_list, char *error_message);
+bool		reload_config(char *config_file, t_configuration_options * orig_options);
-int			repmgr_atoi(const char *s,
+
 						const char *config_item,
 						ItemList *error_list,
 						bool allow_negative);
 extern bool		config_file_found;
 #endif
--- a/dbutils.c
+++ b/dbutils.c
--- a/dbutils.h
+++ b/dbutils.h
@@ -1,7 +1,6 @@
 /*
 * dbutils.h
- *
+ * Copyright (c) 2ndQuadrant, 2010-2014
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,131 +20,27 @@
 #ifndef _REPMGR_DBUTILS_H_
 #define _REPMGR_DBUTILS_H_
 #include "access/xlogdefs.h"
 #include "pqexpbuffer.h"
 #include "config.h"
 #include "strutil.h"
 #define format_lsn(x) (uint32) (x >> 32), (uint32) x
 typedef enum {
 	UNKNOWN = 0,
 	MASTER,
 	STANDBY,
 	WITNESS
 } t_server_type;
 /*
 * Struct to store node information
 */
 typedef struct s_node_info
 {
 	int			  node_id;
 	int			  upstream_node_id;
 	t_server_type type;
 	char		  name[MAXLEN];
 	char		  conninfo_str[MAXLEN];
 	char		  slot_name[MAXLEN];
 	int			  priority;
 	bool		  active;
 	bool		  is_ready;
 	bool		  is_visible;
 	XLogRecPtr	  xlog_location;
 }	t_node_info;
 #define T_NODE_INFO_INITIALIZER { \
  NODE_NOT_FOUND, \
  NO_UPSTREAM_NODE, \
  UNKNOWN, \
  "", \
  "", \
  "", \
  DEFAULT_PRIORITY, \
  true, \
  false, \
  false, \
  InvalidXLogRecPtr \
 }
 /*
 * Struct to store replication slot information
 */
 typedef struct s_replication_slot
 {
 	char slot_name[MAXLEN];
    char slot_type[MAXLEN];
 	bool active;
 }   t_replication_slot;
 extern char		repmgr_schema[MAXLEN];
 PGconn *_establish_db_connection(const char *conninfo,
 								 const bool exit_on_error,
 								 const bool log_notice,
 								 const bool verbose_only);
 PGconn *establish_db_connection(const char *conninfo,
-								const bool exit_on_error);
+						const bool exit_on_error);
 PGconn *establish_db_connection_quiet(const char *conninfo);
 PGconn *test_db_connection(const char *conninfo);
 PGconn *establish_db_connection_by_params(const char *keywords[],
 								  const char *values[],
 								  const bool exit_on_error);
 bool		begin_transaction(PGconn *conn);
 bool		commit_transaction(PGconn *conn);
 bool		rollback_transaction(PGconn *conn);
 bool		check_cluster_schema(PGconn *conn);
 int			is_standby(PGconn *conn);
 int			is_witness(PGconn *conn, char *schema, char *cluster, int node_id);
 bool		is_pgup(PGconn *conn, int timeout);
-int			get_master_node_id(PGconn *conn, char *cluster);
+char	   *pg_version(PGconn *conn, char *major_version);
-int			get_server_version(PGconn *conn, char *server_version);
+int guc_set(PGconn *conn, const char *parameter, const char *op,
-bool		get_cluster_size(PGconn *conn, char *size);
+		const char *value);
-bool		get_pg_setting(PGconn *conn, const char *setting, char *output);
+int guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 int			guc_set(PGconn *conn, const char *parameter, const char *op,
 			const char *value);
 int			guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 			  const char *value, const char *datatype);
-bool		get_conninfo_value(const char *conninfo, const char *keyword, char *output);
+
-PGconn     *get_upstream_connection(PGconn *standby_conn, char *cluster,
+const char *get_cluster_size(PGconn *conn);
-									int node_id,
+PGconn *get_master_connection(PGconn *standby_conn, char *schema, char *cluster,
 									int *upstream_node_id_ptr,
 									char *upstream_conninfo_out);
 PGconn	   *get_master_connection(PGconn *standby_conn, char *cluster,
 					  int *master_id, char *master_conninfo_out);
 int			wait_connection_availability(PGconn *conn, long long timeout);
 bool		cancel_query(PGconn *conn, int timeout);
 char       *get_repmgr_schema(void);
 char       *get_repmgr_schema_quoted(PGconn *conn);
 bool		create_replication_slot(PGconn *conn, char *slot_name, int server_version_num, PQExpBufferData *error_msg);
 int			get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
 bool		drop_replication_slot(PGconn *conn, char *slot_name);
 bool		start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint, int server_version_num);
 bool		stop_backup(PGconn *conn, char *last_wal_segment, int server_version_num);
 bool		set_config(PGconn *conn, const char *config_param,  const char *config_value);
 bool		set_config_bool(PGconn *conn, const char *config_param, bool state);
 bool		witness_copy_node_records(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
 bool		create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active);
 bool		delete_node_record(PGconn *conn, int node, char *action);
 int			get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info);
 int			get_node_record_by_name(PGconn *conn, char *cluster, const char *node_name, t_node_info *node_info);
 bool        update_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active);
 bool        update_node_record_status(PGconn *conn, char *cluster_name, int this_node_id, char *type, int upstream_node_id, bool active);
 bool        update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id);
 bool        create_event_record(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details);
 void        create_checkpoint(PGconn *conn);
 int		    get_node_replication_state(PGconn *conn, char *node_name, char *output);
 t_server_type parse_node_type(const char *type);
 int			get_data_checksum_version(const char *data_directory);
 /* backported from repmgr 4.x */
 XLogRecPtr	parse_lsn(const char *str);
 XLogRecPtr	get_last_wal_receive_location(PGconn *conn);
 bool		is_server_available(const char *conninfo);
 #endif
--- a/debian/DEBIAN/control
+++ b/debian/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: repmgr-auto
-Version: 3.2dev
+Version: 2.0beta2
 Section: database
 Priority: optional
 Architecture: all
-Depends: rsync, postgresql-9.3 | postgresql-9.4 | postgresql-9.5
+Depends: rsync, postgresql-9.0 | postgresql-9.1 | postgresql-9.2 | postgresql-9.3
-Maintainer: Self built package <user@localhost>
+Maintainer: Jaime Casanova <jaime@2ndQuadrant.com>
 Description: PostgreSQL replication setup, magament and monitoring
 has two main executables
--- a/debian/repmgr.repmgrd.default
+++ b/debian/repmgr.repmgrd.default
@@ -12,7 +12,7 @@ REPMGRD_ENABLED=no
 #REPMGRD_USER=postgres
 # repmgrd binary
-#REPMGRD_BIN=/usr/bin/repmgrd
+#REPMGR_BIN=/usr/bin/repmgr
 # pid file
-#REPMGRD_PIDFILE=/var/run/repmgrd.pid
+#REPMGR_PIDFILE=/var/run/repmgrd.pid
--- a/debian/repmgr.repmgrd.init
+++ b/debian/repmgr.repmgrd.init
@@ -59,7 +59,7 @@ do_stop()
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   other if daemon could not be stopped or a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $REPMGRD_PIDFILE --name "$(basename $REPMGRD_BIN)"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN
 }
 case "$1" in
--- a/dirmod.c
+++ b/dirmod.c
@@ -1,194 +0,0 @@
 /*
 *
 * dirmod.c
 *	  directory handling functions
 *
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #include "postgres_fe.h"
 /* Don't modify declarations in system headers */
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
 /*
 * pgfnames
 *
 * return a list of the names of objects in the argument directory.  Caller
 * must call pgfnames_cleanup later to free the memory allocated by this
 * function.
 */
 char	  **
 pgfnames(const char *path)
 {
 	DIR		   *dir;
 	struct dirent *file;
 	char	  **filenames;
 	int			numnames = 0;
 	int			fnsize = 200;	/* enough for many small dbs */
 	dir = opendir(path);
 	if (dir == NULL)
 	{
 		return NULL;
 	}
 	filenames = (char **) palloc(fnsize * sizeof(char *));
 	while (errno = 0, (file = readdir(dir)) != NULL)
 	{
 		if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0)
 		{
 			if (numnames + 1 >= fnsize)
 			{
 				fnsize *= 2;
 				filenames = (char **) repalloc(filenames,
 											   fnsize * sizeof(char *));
 			}
 			filenames[numnames++] = pstrdup(file->d_name);
 		}
 	}
 	if (errno)
 	{
 		fprintf(stderr, _("could not read directory \"%s\": %s\n"),
 				path, strerror(errno));
 	}
 	filenames[numnames] = NULL;
 	if (closedir(dir))
 	{
 		fprintf(stderr, _("could not close directory \"%s\": %s\n"),
 				path, strerror(errno));
 	}
 	return filenames;
 }
 /*
 *	pgfnames_cleanup
 *
 *	deallocate memory used for filenames
 */
 void
 pgfnames_cleanup(char **filenames)
 {
 	char	  **fn;
 	for (fn = filenames; *fn; fn++)
 		pfree(*fn);
 	pfree(filenames);
 }
 /*
 *	rmtree
 *
 *	Delete a directory tree recursively.
 *	Assumes path points to a valid directory.
 *	Deletes everything under path.
 *	If rmtopdir is true deletes the directory too.
 *	Returns true if successful, false if there was any problem.
 *	(The details of the problem are reported already, so caller
 *	doesn't really have to say anything more, but most do.)
 */
 bool
 rmtree(const char *path, bool rmtopdir)
 {
 	bool		result = true;
 	char		pathbuf[MAXPGPATH];
 	char	  **filenames;
 	char	  **filename;
 	struct stat statbuf;
 	/*
 	 * we copy all the names out of the directory before we start modifying
 	 * it.
 	 */
 	filenames = pgfnames(path);
 	if (filenames == NULL)
 		return false;
 	/* now we have the names we can start removing things */
 	for (filename = filenames; *filename; filename++)
 	{
 		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, *filename);
 		/*
 		 * It's ok if the file is not there anymore; we were just about to
 		 * delete it anyway.
 		 *
 		 * This is not an academic possibility. One scenario where this
 		 * happens is when bgwriter has a pending unlink request for a file in
 		 * a database that's being dropped. In dropdb(), we call
 		 * ForgetDatabaseFsyncRequests() to flush out any such pending unlink
 		 * requests, but because that's asynchronous, it's not guaranteed that
 		 * the bgwriter receives the message in time.
 		 */
 		if (lstat(pathbuf, &statbuf) != 0)
 		{
 			if (errno != ENOENT)
 			{
 				result = false;
 			}
 			continue;
 		}
 		if (S_ISDIR(statbuf.st_mode))
 		{
 			/* call ourselves recursively for a directory */
 			if (!rmtree(pathbuf, true))
 			{
 				/* we already reported the error */
 				result = false;
 			}
 		}
 		else
 		{
 			if (unlink(pathbuf) != 0)
 			{
 				if (errno != ENOENT)
 				{
 					result = false;
 				}
 			}
 		}
 	}
 	if (rmtopdir)
 	{
 		if (rmdir(path) != 0)
 		{
 			result = false;
 		}
 	}
 	pgfnames_cleanup(filenames);
 	return result;
 }
--- a/dirmod.h
+++ b/dirmod.h
@@ -1,23 +0,0 @@
 /*
 * dirmod.h
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #ifndef _DIRMOD_H_
 #define _DIRMOD_H_
 #endif
--- a/docs/repmgrd-failover-mechanism.md
+++ b/docs/repmgrd-failover-mechanism.md
@@ -1,75 +0,0 @@
 repmgrd's failover algorithm
 ============================
 When implementing automatic failover, there are two factors which are critical in
 ensuring the desired result is achieved:
  - has the master node genuinely failed?
  - which is the best node to promote to the new master?
 This document outlines repmgrd's decision-making process during automatic failover
 for standbys directly connected to the master node.
 Master node failure detection
 -----------------------------
 If a `repmgrd` instance running on a PostgreSQL standby node is unable to connect to
 the master node, this doesn't neccesarily mean that the master is down and a
 failover is required. Factors such as network connectivity issues could mean that
 even though the standby node is isolated, the replication cluster as a whole
 is functioning correctly, and promoting the standby without further verification
 could result in a "split-brain" situation.
 In the event that `repmgrd` is unable to connect to the master node, it will attempt
 to reconnect to the master server several times (as defined by the `reconnect_attempts`
 parameter in `repmgr.conf`), with reconnection attempts  occuring at the interval
 specified by `reconnect_interval`. This happens to verify that the master is definitively
 not accessible (e.g. that connection was not lost due to a brief network glitch).
 Appropriate values for these settings will depend very much on the replication
 cluster environment. There will necessarily be a trade-off between the time it
 takes to assume the master is not reachable, and the reliability of that conclusion.
 A standby in a different physical location to the master will probably need a longer
 check interval to rule out possible network issues, whereas one located in the same
 rack with a direct connection between servers could perform the check very quickly.
 Note that it's possible the master comes back online after this point is reached,
 but before a new master has been selected; in this case it will be noticed
 during the selection of a new master and no actual failover will take place.
 Promotion candidate selection
 -----------------------------
 Once `repmgrd` has decided the master is definitively unreachable, following checks
 will be carried out:
 * attempts to connect to all other nodes in the cluster (including the witness
  node, if defined) to establish the state of the cluster, including their
  current LSN
 * If less than half of the nodes are visible (from the viewpoint
  of this node), `repmgrd` will not take any further action. This is to ensure that
  e.g. if a replication cluster is spread over multiple data centres, a split-brain
  situation does not occur if there is a network failure between datacentres. Note
  that if nodes are split evenly between data centres, a witness server can be
  used to establish the "majority" data centre.
 * `repmgrd` polls all visible servers and waits for each node to return a valid LSN;
  it updates the LSN previously  stored for this node if it has increased since
  the initial check
 * once all LSNs have been retrieved, `repmgrd` will check for the highest LSN; if
  its own node has the highest LSN, it will attempt to promote itself (using the
  command defined in `promote_command` in `repmgr.conf`. Note that if using
  `repmgr standby promote` as the promotion command, and the original master becomes available
  before the promotion takes effect, `repmgr` will return an error and no promotion
  will take place, and `repmgrd` will resume monitoring as usual.
 * if the node is not the promotion candidate, `repmgrd` will execute the
  `follow_command` defined in `repmgr.conf`. If using `repmgr standby follow` here,
  `repmgr` will attempt to detect the new master node and attach to that.
--- a/docs/repmgrd-node-fencing.md
+++ b/docs/repmgrd-node-fencing.md
@@ -1,160 +0,0 @@
 Fencing a failed master node with repmgrd and pgbouncer
 =======================================================
 With automatic failover, it's essential to ensure that a failed master
 remains inaccessible to your application, even if it comes back online
 again, to avoid a split-brain situation.
 By using `pgbouncer` together with `repmgrd`, it's possible to combine
 automatic failover with a process to isolate the failed master from
 your application and ensure that all connections which should go to
 the master are directed there smoothly without having to reconfigure
 your application. (Note that as a connection pooler, `pgbouncer` can
 benefit your application in other ways, but those are beyond the scope
 of this document).
 * * *
 > *WARNING*: automatic failover is tricky to get right. This document
 > demonstrates one possible implementation method, however you should
 > carefully configure and test any setup to suit the needs of your own
 > replication cluster/application.
 * * *
 In a failover situation, `repmgrd` promotes a standby to master by executing
 the command defined in `promote_command`. Normally this would be something like:
    repmgr standby promote -f /etc/repmgr.conf
 By wrapping this in a custom script which adjusts the `pgbouncer` configuration
 on all nodes, it's possible to fence the failed master and redirect write
 connections to the new master.
 The script consists of three sections:
 * commands to pause `pgbouncer` on all nodes
 * the promotion command itself
 * commands to reconfigure and restart `pgbouncer` on all nodes
 Note that it requires password-less SSH access between all nodes to be able to
 update the `pgbouncer` configuration files.
 For the purposes of this demonstration, we'll assume there are 3 nodes (master
 and two standbys), with `pgbouncer` listening on port 6432 handling connections
 to a database called `appdb`.  The `postgres` system user must have write
 access to the `pgbouncer` configuration files on all nodes. We'll assume
 there's a main `pgbouncer` configuration file, `/etc/pgbouncer.ini`, which uses
 the `%include` directive (available from PgBouncer 1.6) to include a separate
 configuration file, `/etc/pgbouncer.database.ini`, which will be modified by
 `repmgr`.
 * * *
 > *NOTE*: in this self-contained demonstration, `pgbouncer` is running on the
 > database servers, however in a production environment it will make more
 > sense to run `pgbouncer` on either separate nodes or the application server.
 * * *
 `/etc/pgbouncer.ini` should look something like this:
    [pgbouncer]
    logfile = /var/log/pgbouncer/pgbouncer.log
    pidfile = /var/run/pgbouncer/pgbouncer.pid
    listen_addr = *
    listen_port = 6532
    unix_socket_dir = /tmp
    auth_type = trust
    auth_file = /etc/pgbouncer.auth
    admin_users = postgres
    stats_users = postgres
    pool_mode = transaction
    max_client_conn = 100
    default_pool_size = 20
    min_pool_size = 5
    reserve_pool_size = 5
    reserve_pool_timeout = 3
    log_connections = 1
    log_disconnections = 1
    log_pooler_errors = 1
    %include /etc/pgbouncer.database.ini
 The actual script is as follows; adjust the configurable items as appropriate:
 `/var/lib/postgres/repmgr/promote.sh`
    #!/usr/bin/env bash
    set -u
    set -e
    # Configurable items
    PGBOUNCER_HOSTS="node1 node2 node3"
    PGBOUNCER_DATABASE_INI="/etc/pgbouncer.database.ini"
    PGBOUNCER_DATABASE="appdb"
    PGBOUNCER_PORT=6432
    REPMGR_DB="repmgr"
    REPMGR_USER="repmgr"
    REPMGR_SCHEMA="repmgr_test"
    # 1. Pause running pgbouncer instances
    for HOST in $PGBOUNCER_HOSTS
    do
        psql -t -c "pause" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
    done
    # 2. Promote this node from standby to master
    repmgr standby promote -f /etc/repmgr.conf
    # 3. Reconfigure pgbouncer instances
    PGBOUNCER_DATABASE_INI_NEW="/tmp/pgbouncer.database.ini"
    for HOST in $PGBOUNCER_HOSTS
    do
        # Recreate the pgbouncer config file
        echo -e "[databases]\n" > $PGBOUNCER_DATABASE_INI_NEW
        psql -d $REPMGR_DB -U $REPMGR_USER -t -A \
          -c "SELECT '${PGBOUNCER_DATABASE}-rw= ' || conninfo || ' application_name=pgbouncer_${HOST}' \
              FROM ${REPMGR_SCHEMA}.repl_nodes \
              WHERE active = TRUE AND type='master'" >> $PGBOUNCER_DATABASE_INI_NEW
        psql -d $REPMGR_DB -U $REPMGR_USER -t -A \
          -c "SELECT '${PGBOUNCER_DATABASE}-ro= ' || conninfo || ' application_name=pgbouncer_${HOST}' \
              FROM ${REPMGR_SCHEMA}.repl_nodes \
              WHERE node_name='${HOST}'" >> $PGBOUNCER_DATABASE_INI_NEW
        rsync $PGBOUNCER_DATABASE_INI_NEW $HOST:$PGBOUNCER_DATABASE_INI
        psql -tc "reload" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
        psql -tc "resume" -h $HOST -p $PGBOUNCER_PORT -U postgres pgbouncer
    done
    # Clean up generated file
    rm $PGBOUNCER_DATABASE_INI_NEW
    echo "Reconfiguration of pgbouncer complete"
 Script and template file should be installed on each node where
 `repmgrd` is running.
 Finally, set `promote_command` in `repmgr.conf` on each node to
 point to the custom promote script:
    promote_command=/var/lib/postgres/repmgr/promote.sh
 and reload/restart any running `repmgrd` instances for the changes to take
 effect.
--- a/errcode.h
+++ b/errcode.h
@@ -1,6 +1,6 @@
 /*
 * errcode.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,21 +25,16 @@
 #define SUCCESS 0
 #define ERR_BAD_CONFIG 1
 #define ERR_BAD_RSYNC 2
 #define ERR_STOP_BACKUP 3
 #define ERR_NO_RESTART 4
 #define ERR_NEEDS_XLOG 5
 #define ERR_DB_CON 6
 #define ERR_DB_QUERY 7
 #define ERR_PROMOTED 8
 #define ERR_BAD_PASSWORD 9
 #define ERR_STR_OVERFLOW 10
 #define ERR_FAILOVER_FAIL 11
 #define ERR_BAD_SSH 12
 #define ERR_SYS_FAILURE 13
 #define ERR_BAD_BASEBACKUP 14
 #define ERR_INTERNAL 15
 #define ERR_MONITORING_FAIL 16
 #define ERR_BAD_BACKUP_LABEL 17
 #define ERR_SWITCHOVER_FAIL 18
 #define ERR_BARMAN 19
 #define ERR_REGISTRATION_SYNC 20
 #endif   /* _ERRCODE_H_ */
--- a/expected/repmgr_funcs.out
+++ b/expected/repmgr_funcs.out
@@ -1,18 +0,0 @@
 /*
 * repmgr_function.sql
 * Copyright (c) 2ndQuadrant, 2010-2017
 *
 */
 -- SET SEARCH_PATH TO 'repmgr';
 CREATE FUNCTION repmgr_update_standby_location(text) RETURNS boolean
 AS '$libdir/repmgr_funcs', 'repmgr_update_standby_location'
 LANGUAGE C STRICT;
 CREATE FUNCTION repmgr_get_last_standby_location() RETURNS text
 AS '$libdir/repmgr_funcs', 'repmgr_get_last_standby_location'
 LANGUAGE C STRICT;
 CREATE FUNCTION repmgr_update_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
 AS '$libdir/repmgr_funcs', 'repmgr_update_last_updated'
 LANGUAGE C STRICT;
 CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
 AS '$libdir/repmgr_funcs', 'repmgr_get_last_updated'
 LANGUAGE C STRICT;
--- a/expected/repmgr_test.out
+++ b/expected/repmgr_test.out
@@ -1,24 +0,0 @@
 select * from repmgr_update_standby_location('');
 repmgr_update_standby_location 
 --------------------------------
 f
 (1 row)
 select * from repmgr_get_last_standby_location();
 repmgr_get_last_standby_location 
 ----------------------------------
 (1 row)
 select * from repmgr_update_last_updated();
 repmgr_update_last_updated 
 ----------------------------
 (1 row)
 select * from repmgr_get_last_updated();
 repmgr_get_last_updated 
 -------------------------
 (1 row)
--- a/log.c
+++ b/log.c
@@ -1,6 +1,6 @@
 /*
 * log.c - Logging methods
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 * This module is a set of methods for logging (currently only syslog)
 *
@@ -39,142 +39,39 @@
 /* #define REPMGR_DEBUG */
-static int	detect_log_facility(const char *facility);
+void
 static void _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));
 int			log_type = REPMGR_STDERR;
 int			log_level = LOG_INFO;
 int			last_log_level = LOG_INFO;
 int			verbose_logging = false;
 int			terse_logging = false;
 /*
 * Global variable to be set by the main application to ensure any log output
 * emitted before logger_init is called, is output in the correct format
 */
 int			logger_output_mode = OM_DAEMON;
 extern void
 stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
 {
-	va_list		arglist;
+	time_t		t;
-
+	struct tm  *tm;
-	va_start(arglist, fmt);
+	char		buff[100];
-	_stderr_log_with_level(level_name, level, fmt, arglist);
+	va_list		ap;
 	va_end(arglist);
 }
 static void
 _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
 {
 	char		buf[100];
 	/*
 	 * Store the requested level so that if there's a subsequent
 	 * log_hint() or log_detail(), we can suppress that if appropriate.
 	 */
 	last_log_level = level;
 	if (log_level >= level)
 	{
 		time(&t);
 		tm = localtime(&t);
 		strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
 		fprintf(stderr, "%s [%s] ", buff, level_name);
-		/* Format log line prefix with timestamp if in daemon mode */
+		va_start(ap, fmt);
 		if (logger_output_mode == OM_DAEMON)
 		{
 			time_t		t;
 			struct tm  *tm;
 			time(&t);
 			tm = localtime(&t);
 			strftime(buf, 100, "[%Y-%m-%d %H:%M:%S]", tm);
 			fprintf(stderr, "%s [%s] ", buf, level_name);
 		}
 		else
 		{
 			fprintf(stderr, "%s: ", level_name);
 		}
 		vfprintf(stderr, fmt, ap);
 		va_end(ap);
 		fflush(stderr);
 	}
 }
 void
 log_hint(const char *fmt, ...)
 {
 	va_list		ap;
-	if (terse_logging == false)
+static int	detect_log_level(const char *level);
-	{
+static int	detect_log_facility(const char *facility);
 		va_start(ap, fmt);
 		_stderr_log_with_level("HINT", last_log_level, fmt, ap);
 		va_end(ap);
 	}
 }
 void
 log_detail(const char *fmt, ...)
 {
 	va_list		ap;
 	if (terse_logging == false)
 	{
 		va_start(ap, fmt);
 		_stderr_log_with_level("DETAIL", last_log_level, fmt, ap);
 		va_end(ap);
 	}
 }
 void
 log_verbose(int level, const char *fmt, ...)
 {
 	va_list		ap;
 	va_start(ap, fmt);
 	if (verbose_logging == true)
 	{
 		switch(level)
 		{
 			case LOG_EMERG:
 				_stderr_log_with_level("EMERG", level, fmt, ap);
 				break;
 			case LOG_ALERT:
 				_stderr_log_with_level("ALERT", level, fmt, ap);
 				break;
 			case LOG_CRIT:
 				_stderr_log_with_level("CRIT", level, fmt, ap);
 				break;
 			case LOG_ERR:
 				_stderr_log_with_level("ERR", level, fmt, ap);
 				break;
 			case LOG_WARNING:
 				_stderr_log_with_level("WARNING", level, fmt, ap);
 				break;
 			case LOG_NOTICE:
 				_stderr_log_with_level("NOTICE", level, fmt, ap);
 				break;
 			case LOG_INFO:
 				_stderr_log_with_level("INFO", level, fmt, ap);
 				break;
 			case LOG_DEBUG:
 				_stderr_log_with_level("DEBUG", level, fmt, ap);
 				break;
 		}
 	}
 	va_end(ap);
 }
 int			log_type = REPMGR_STDERR;
 int			log_level = LOG_NOTICE;
 bool
-logger_init(t_configuration_options *opts, const char *ident)
+logger_init(t_configuration_options * opts, const char *ident, const char *level, const char *facility)
 {
 	char	   *level = opts->loglevel;
 	char	   *facility = opts->logfacility;
 	int			l;
 	int			f;
@@ -198,19 +95,12 @@ logger_init(t_configuration_options *opts, const char *ident)
 		printf("Assigned level for logger: %d\n", l);
 #endif
-		if (l >= 0)
+		if (l > 0)
 			log_level = l;
 		else
-			stderr_log_warning(_("Invalid log level \"%s\" (available values: DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
+			stderr_log_warning(_("Cannot detect log level %s (use any of DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
 	}
 	/*
 	 * STDERR only logging requested - finish here without setting up any further
 	 * logging facility.
 	 */
 	if (logger_output_mode == OM_COMMAND_LINE)
 		return true;
 	if (facility && *facility)
 	{
@@ -254,39 +144,18 @@ logger_init(t_configuration_options *opts, const char *ident)
 	{
 		FILE	   *fd;
 		/* Check if we can write to the specified file before redirecting
 		 * stderr - if freopen() fails, stderr output will vanish into
 		 * the ether and the user won't know what's going on.
 		 */
 		fd = fopen(opts->logfile, "a");
 		if (fd == NULL)
 		{
 			stderr_log_err(_("Unable to open specified logfile '%s' for writing: %s\n"), opts->logfile, strerror(errno));
 			stderr_log_err(_("Terminating\n"));
 			exit(ERR_BAD_CONFIG);
 		}
 		fclose(fd);
 		stderr_log_notice(_("Redirecting logging output to '%s'\n"), opts->logfile);
 		fd = freopen(opts->logfile, "a", stderr);
 		/*
 		 * It's possible freopen() may still fail due to e.g. a race condition;
 		 * as it's not feasible to restore stderr after a failed freopen(),
 		 * we'll write to stdout as a last resort.
 		 */
 		if (fd == NULL)
 		{
-			printf(_("Unable to open specified logfile %s for writing: %s\n"), opts->logfile, strerror(errno));
+			fprintf(stderr, "error reopening stderr to '%s': %s",
-			printf(_("Terminating\n"));
+					opts->logfile, strerror(errno));
 			exit(ERR_BAD_CONFIG);
 		}
 	}
 	return true;
 }
 }
 bool
 logger_shutdown(void)
@@ -300,32 +169,17 @@ logger_shutdown(void)
 }
 /*
- * Indicate whether extra-verbose logging is required. This will
+ * Set a minimum logging level.  Intended for command line verbosity
- * generate a lot of output, particularly debug logging, and should
+ * options, which might increase requested logging over what's specified
- * not be permanently enabled in production.
+ * in the regular configuration file.
 *
 * NOTE: in previous repmgr versions, this option forced the log
 * level to INFO.
 */
 void
-logger_set_verbose(void)
+logger_min_verbose(int minimum)
 {
-	verbose_logging = true;
+	if (log_level < minimum)
 		log_level = minimum;
 }
 /*
 * Indicate whether some non-critical log messages can be omitted.
 * Currently this includes warnings about irrelevant command line
 * options and hints.
 */
 void logger_set_terse(void)
 {
 	terse_logging = true;
 }
 int
 detect_log_level(const char *level)
 {
@@ -346,16 +200,17 @@ detect_log_level(const char *level)
 	if (!strcmp(level, "EMERG"))
 		return LOG_EMERG;
-	return -1;
+	return 0;
 }
-static int
+int
 detect_log_facility(const char *facility)
 {
 	int			local = 0;
 	if (!strncmp(facility, "LOCAL", 5) && strlen(facility) == 6)
 	{
 		local = atoi(&facility[5]);
 		switch (local)
--- a/log.h
+++ b/log.h
@@ -1,6 +1,6 @@
 /*
 * log.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,7 @@
 #define REPMGR_SYSLOG 1
 #define REPMGR_STDERR 2
-#define OM_COMMAND_LINE 1
+void
 #define OM_DAEMON       2
 extern void
 stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
@@ -115,28 +112,15 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
 #endif
 int			detect_log_level(const char *level);
 /* Logger initialisation and shutdown */
 bool		logger_init(t_configuration_options * opts, const char *ident);
 bool		logger_shutdown(void);
-void		logger_set_verbose(void);
+bool logger_init(t_configuration_options * opts, const char *ident,
-void		logger_set_terse(void);
+			const char *level, const char *facility);
-void		log_detail(const char *fmt, ...)
+void		logger_min_verbose(int minimum);
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 void		log_hint(const char *fmt, ...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 void		log_verbose(int level, const char *fmt, ...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
 extern int	log_type;
 extern int	log_level;
 extern int	verbose_logging;
 extern int	terse_logging;
 extern int	logger_output_mode;
-#endif /* _REPMGR_LOG_H_ */
+#endif
--- a/repmgr.c
+++ b/repmgr.c
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -1,215 +1,62 @@
 ###################################################
-# Replication Manager sample configuration file
+# Replication Manager configuration file
 ###################################################
-# Some configuration items will be set with a default value; this
+# Cluster name
-# is noted for each item. Where no default value is shown, the
+cluster=test
 # parameter will be treated as empty or false.
-# Required configuration items
+# Node ID
-# ============================
+node=2
-#
+node_name=standby2
 # repmgr and repmgrd require these items to be configured:
-# Cluster name - this will be used by repmgr to generate its internal
+# Connection information
-# schema (pattern: "repmgr_{cluster}"); while this name will be quoted
+conninfo='host=192.168.204.104'
-# to preserve case, we recommend using lower case and avoiding whitespace
+rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
-# to facilitate easier querying of the repmgr views and tables.
+ssh_options=-o "StrictHostKeyChecking no"
 #cluster=example_cluster
-# Node ID and name
+# How many seconds we wait for master response before declaring master failure
-# (Note: we recommend to avoid naming nodes after their initial
+master_response_timeout=60
 #  replication function, as this will cause confusion when e.g.
 #  "standby2" is promoted to primary)
 #node=2           # a unique integer
 #node_name=node2  # an arbitrary (but unique) string; we recommend using
                 # the server's hostname or another identifier unambiguously
                 # associated with the server to avoid confusion
-# Database connection information as a conninfo string (this must be a
+# How many time we try to reconnect to master before starting failover procedure
-# keyword/value string, not a connection URI).
+reconnect_attempts=6
-#
+reconnect_interval=10
 #   https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
 #
 # All servers in the cluster must be able to access the database
 # using this connection string.
 #
 #conninfo='host=192.168.204.104 dbname=repmgr user=repmgr'
 #
 # If repmgrd is in use, consider explicitly setting `connect_timeout` in the
 # conninfo string to determine the length of time which elapses before
 # a network connection attempt is abandoned; for details see:
 #
 #   https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNECT-CONNECT-TIMEOUT
 # Optional configuration items
 # ============================
 # Replication settings
 # ---------------------
 # When using cascading replication, a standby can connect to another
 # upstream standby node which is specified by setting 'upstream_node'.
 # In that case, the upstream node must exist before the new standby
 # can be registered. If 'upstream_node' is not set, then the standby
 # will connect directly to the primary node.
 #upstream_node=1
 # use physical replication slots - PostgreSQL 9.4 and later only
 # (default: 0)
 #use_replication_slots=0
 # NOTE: 'max_replication_slots' should be configured for at least the
 # number of standbys which will connect to the primary.
 # Logging and monitoring settings
 # -------------------------------
 # Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
 # (default: INFO)
 #loglevel=INFO
 # Note that logging facility settings will only apply to `repmgrd` by default;
 # `repmgr` will always write to STDERR unless the switch `--log-to-file` is
 # supplied, in which case it will log to the same destination as `repmgrd`.
 # This is mainly intended for those cases when `repmgr` is executed directly
 # by `repmgrd`.
 # Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
 # (default: STDERR)
 #logfacility=STDERR
 # stderr can be redirected to an arbitrary file:
 #
 #logfile='/var/log/repmgr/repmgr.log'
 # event notifications can be passed to an arbitrary external program
 # together with the following parameters:
 #
 #   %n - node ID
 #   %e - event type
 #   %s - success (1 or 0)
 #   %t - timestamp
 #   %d - details
 #
 # the values provided for "%t" and "%d" will probably contain spaces,
 # so should be quoted in the provided command configuration, e.g.:
 #
 #event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
 # By default, all notifications will be passed; the notification types
 # can be filtered to explicitly named ones:
 #
 #event_notifications=master_register,standby_register,witness_create
 # Environment/command settings
 # ----------------------------
 # path to PostgreSQL binary directory (location of pg_ctl, pg_basebackup etc.)
 # (if not provided, defaults to system $PATH)
 #pg_bindir=/usr/bin/
 #
 # Debian/Ubuntu users: you will probably need to set this to the directory
 # where `pg_ctl` is located, e.g. /usr/lib/postgresql/9.5/bin/
 # service control commands
 #
 # repmgr provides options to override the default pg_ctl commands
 # used to stop, start, restart, reload and promote the PostgreSQL cluster
 #
 # NOTE: These commands must be runnable on remote nodes as well for switchover
 # to function correctly.
 #
 # If you use sudo, the user repmgr runs as (usually 'postgres')  must have
 # passwordless sudo access to execute the command
 #
 # For example, to use systemd, you may use the following configuration:
 #
 #    # this is required when running sudo over ssh without -t:
 #    Defaults:postgres !requiretty
 #    postgres ALL = NOPASSWD: /usr/bin/systemctl stop postgresql-9.5, \
 #       /usr/bin/systemctl start postgresql-9.5, \
 #       /usr/bin/systemctl restart postgresql-9.5
 #
 # service_start_command = systemctl start postgresql-9.5
 # service_stop_command = systemctl stop postgresql-9.5
 # service_restart_command = systemctl restart postgresql-9.5
 # service_reload_command = pg_ctlcluster 9.5 main reload
 # service_promote_command = pg_ctlcluster 9.5 main promote
 # external command options
 #rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
 #ssh_options=-o "StrictHostKeyChecking no"
 # external command arguments. Values shown are examples.
 #pg_ctl_options='-s'
 #pg_basebackup_options='--label=repmgr_backup'
 # This is the host name of the barman server, which is used for connecting over
 # to the barman server (passwordless ssh keys should be in place)
 #barman_server='backup_server'
 # If you are placing the barman.conf file in a non-standard path, or using
 # a name other than barman.conf, use this parameter to specify the path and
 # name of the barman configuration file.
 #barman_config='/path/to/barman.conf'
 # Standby clone settings
 # ----------------------
 #
 # These settings apply when cloning a standby (`repmgr standby clone`).
 # Tablespaces can be remapped from one file system location to another:
 #
 # tablespace_mapping=/path/to/original/tablespace=/path/to/new/tablespace
 # You can specify a restore_command to be used in the recovery.conf that
 # will be placed in the cloned standby
 #
 # restore_command = cp /path/to/archived/wals/%f %p
 # Failover settings (repmgrd)
 # ---------------------------
 #
 # These settings are only applied when repmgrd is running. Values shown
 # are defaults.
 # monitoring interval in seconds; default is 2
 #monitor_interval_secs=2
 # Maximum number of seconds to wait for a response from the primary server
 # before deciding it has failed.
 #master_response_timeout=60
 # Number of attempts at what interval (in seconds) to try and
 # connect to  a server to establish its status (e.g. master
 # during failover)
 #reconnect_attempts=6
 #reconnect_interval=10
 # Autofailover options
-#failover=manual    # one of 'automatic', 'manual' (default: manual)
+failover=manual
-                    # defines the action to take in the event of upstream failure
+priority=-1
-                    #
+promote_command='repmgr standby promote -f /path/to/repmgr.conf'
-                    # 'automatic': repmgrd will automatically attempt to promote the
+follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
                    #    node or follow the new upstream node
                    # 'manual': repmgrd will take no action and the mode will require
                    #    manual attention to reattach it to replication
-#priority=100       # indicate a preferred priorty for promoting nodes
+# Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
-                    # a value of zero or less prevents the node being promoted to primary
+# Default: NOTICE
-                    # (default: 100)
+loglevel=NOTICE
-#promote_command='repmgr standby promote -f /path/to/repmgr.conf'
+# Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
-#follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
+# Default: STDERR
 logfacility=STDERR
-# change wait time for primary; before we bail out and exit when the primary
+# path to pg_ctl executable
-# disappears, we wait 'reconnect_attempts' * 'retry_promote_interval_secs'
+pg_bindir=/usr/bin/
 # seconds; by default this would be half an hour, as 'retry_promote_interval_secs'
 # default value is 300)
 #retry_promote_interval_secs=300
-# Number of seconds after which the witness server resyncs the repl_nodes table
+#
-#witness_repl_nodes_sync_interval_secs=15
+# you may add command line arguments for pg_ctl
 #
 # pg_ctl_options='-s'
 #
 # redirect stderr to a logfile
 #
 # logfile='/var/log/repmgr.log'
 #
 # change monitoring interval; default is 2s
 #
 # monitor_interval_secs=2
 #
 # change wait time for master; before we bail out and exit when the
 # master disappears, we wait 6 * retry_promote_interval_secs seconds;
 # by default this would be half an hour (since sleep_delay default
 # value is 300)
 #
 # retry_promote_interval_secs=300
--- a/repmgr.h
+++ b/repmgr.h
@@ -1,6 +1,6 @@
 /*
 * repmgr.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,228 +20,55 @@
 #ifndef _REPMGR_H_
 #define _REPMGR_H_
-#include <libpq-fe.h>
+#include "postgres_fe.h"
-#include <postgres_fe.h>
+#include "getopt_long.h"
-#include <getopt_long.h>
+#include "libpq-fe.h"
 #include "pqexpbuffer.h"
 #include "strutil.h"
 #include "dbutils.h"
 #include "errcode.h"
 #define PRIMARY_MODE		0
 #define STANDBY_MODE		1
 #define WITNESS_MODE		2
 #include "config.h"
-#include "dirmod.h"
+#define MAXFILENAME		1024
 #define ERRBUFF_SIZE		512
-#define MIN_SUPPORTED_VERSION		"9.3"
+#define DEFAULT_CONFIG_FILE		"./repmgr.conf"
-#define MIN_SUPPORTED_VERSION_NUM	90300
+#define DEFAULT_WAL_KEEP_SEGMENTS	"5000"
 #define ERRBUFF_SIZE	512
 #define DEFAULT_WAL_KEEP_SEGMENTS	"0"
 #define DEFAULT_DEST_DIR		"."
 #define DEFAULT_MASTER_PORT		"5432"
 #define DEFAULT_DBNAME			"postgres"
 #define DEFAULT_REPMGR_SCHEMA_PREFIX	"repmgr_"
 #define DEFAULT_PRIORITY		100
 #define FAILOVER_NODES_MAX_CHECK 50
 #define MANUAL_FAILOVER		0
 #define AUTOMATIC_FAILOVER	1
 #define NODE_NOT_FOUND      -1
 #define NO_UPSTREAM_NODE	-1
 #define UNKNOWN_NODE_ID     -1
 /* command line options without short versions */
 #define OPT_HELP                         1
 #define OPT_CHECK_UPSTREAM_CONFIG        2
 #define OPT_RECOVERY_MIN_APPLY_DELAY     3
 #define OPT_COPY_EXTERNAL_CONFIG_FILES   4
 #define OPT_CONFIG_ARCHIVE_DIR           5
 #define OPT_PG_REWIND                    6
 #define OPT_CSV                          8
 #define OPT_NODE                         9
 #define OPT_WITHOUT_BARMAN               10
 #define OPT_NO_UPSTREAM_CONNECTION       11
 #define OPT_REGISTER_WAIT                12
 #define OPT_CLUSTER                      13
 #define OPT_LOG_TO_FILE                  14
 #define OPT_UPSTREAM_CONNINFO            15
 #define OPT_NO_CONNINFO_PASSWORD         16
 #define OPT_REPLICATION_USER             17
 /* deprecated command line options */
 #define OPT_INITDB_NO_PWPROMPT           998
 #define OPT_IGNORE_EXTERNAL_CONFIG_FILES 999
 /* values for --copy-external-config-files */
 #define CONFIG_FILE_SAMEPATH 1
 #define CONFIG_FILE_PGDATA 2
 /* Run time options type */
 typedef struct
 {
 	/* general repmgr options */
 	char		config_file[MAXPGPATH];
 	bool		verbose;
 	bool		terse;
 	bool		force;
 	char		pg_bindir[MAXLEN]; /* overrides setting in repmgr.conf */
 	/* logging parameters */
 	char		loglevel[MAXLEN];  /* overrides setting in repmgr.conf */
 	bool		log_to_file;
 	/* connection parameters */
 	char		dbname[MAXLEN];
 	char		host[MAXLEN];
 	char		username[MAXLEN];
-	char		dest_dir[MAXPGPATH];
+	char		dest_dir[MAXFILENAME];
 	char		config_file[MAXFILENAME];
 	char		remote_user[MAXLEN];
 	char		superuser[MAXLEN];
 	char		masterport[MAXLEN];
 	bool		conninfo_provided;
 	bool		connection_param_provided;
 	bool		host_param_provided;
 	/* standby clone parameters */
 	bool		wal_keep_segments_used;
 	char		wal_keep_segments[MAXLEN];
-	bool		ignore_rsync_warn;
+	bool		verbose;
-	bool		rsync_only;
+	bool		force;
 	bool		fast_checkpoint;
 	bool		without_barman;
 	bool		no_upstream_connection;
 	bool		no_conninfo_password;
 	bool		copy_external_config_files;
 	int			copy_external_config_files_destination;
 	char		upstream_conninfo[MAXLEN];
 	char		replication_user[MAXLEN];
 	char		recovery_min_apply_delay[MAXLEN];
 	/* standby register parameters */
 	bool		wait_register_sync;
 	int			wait_register_sync_seconds;
 	/* witness create parameters */
 	bool		witness_pwprompt;
 	/* standby follow parameters */
 	bool		wait_for_master;
 	bool		ignore_rsync_warn;
-	/* cluster {show|matrix|crosscheck} parameters */
+	char		masterport[MAXLEN];
-	bool		csv_mode;
+	char		localport[MAXLEN];
-	/* cluster cleanup parameters */
+	/* parameter used by CLUSTER CLEANUP */
 	int			keep_history;
 	/* standby switchover parameters */
 	char		remote_config_file[MAXLEN];
 	bool		pg_rewind_supplied;
 	char		pg_rewind[MAXPGPATH];
 	char		pg_ctl_mode[MAXLEN];
 	/* standby {archive_config | restore_config} parameters  */
 	char		config_archive_dir[MAXLEN];
 	/* {standby|witness} unregister parameters */
 	int			node;
 }	t_runtime_options;
-#define T_RUNTIME_OPTIONS_INITIALIZER { \
+#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, "", "", 0 }
 		/* general repmgr options */	\
 		"", false, false, false, "",	\
 		/* logging parameters */ \
 		"", false,                      \
 		/* connection parameters */		\
 		"", "", "", "", "", "", "", 	\
 		false, false, false,		    \
 		/* standby clone parameters */  \
 		false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \
 		false, CONFIG_FILE_SAMEPATH, "", "", "", \
 		/* standby register paarameters */ \
 	    false, 0,							 \
 		/* witness create parameters */ \
 		false,                          \
 		/* standby follow parameters */ \
 		false,                          \
 		/* cluster {show|matrix|crosscheck} parameters */ \
 		false,                          \
 		/* cluster cleanup parameters */ \
 		0,                              \
 		/* standby switchover parameters */ \
 		"", false, "", "fast",          \
 		/* standby {archive_config | restore_config} parameters  */ \
 		"",                             \
 		/* {standby|witness} unregister parameters */ \
 		UNKNOWN_NODE_ID }
 struct BackupLabel
 {
 	XLogRecPtr start_wal_location;
 	char start_wal_file[MAXLEN];
 	XLogRecPtr checkpoint_location;
 	char backup_from[MAXLEN];
 	char backup_method[MAXLEN];
 	char start_time[MAXLEN];
 	char label[MAXLEN];
 	XLogRecPtr min_failover_slot_lsn;
 };
 typedef struct
 {
 	char		slot[MAXLEN];
 	char		xlog_method[MAXLEN];
 	bool		no_slot; /* from PostgreSQL 10 */
 } t_basebackup_options;
 #define T_BASEBACKUP_OPTIONS_INITIALIZER { "", "", false }
 typedef struct
 {
 	int    size;
 	char **keywords;
 	char **values;
 } t_conninfo_param_list;
 typedef struct
 {
 	char filepath[MAXPGPATH];
 	char filename[MAXPGPATH];
 	bool in_data_directory;
 } t_configfile_info;
 typedef struct
 {
 	int    size;
 	int    entries;
 	t_configfile_info **files;
 } t_configfile_list;
 #define T_CONFIGFILE_LIST_INITIALIZER { 0, 0, NULL }
 typedef struct
 {
 	int node_id;
 	int node_status;
 } t_node_status_rec;
 typedef struct
 {
 	int node_id;
 	char node_name[MAXLEN];
 	t_node_status_rec **node_status_list;
 } t_node_matrix_rec;
 typedef struct
 {
 	int node_id;
 	char node_name[MAXLEN];
 	t_node_matrix_rec **matrix_list_rec;
 } t_node_status_cube;
 #endif
--- a/repmgr.sql
+++ b/repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * repmgr.sql
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 */
@@ -59,12 +59,3 @@ WHERE (standby_node, last_monitor_time) IN (SELECT standby_node, MAX(last_monito
 ALTER VIEW repl_status OWNER TO repmgr;
 CREATE INDEX idx_repl_status_sort ON repl_monitor(last_monitor_time, standby_node);
 /*
 * This view shows the list of nodes with the information of which one is the upstream
 * in each case (when appliable)
 */
 CREATE VIEW repl_show_nodes AS
 SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
 	rn.priority, rn.active, sq.name AS upstream_node_name
 FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
--- a/repmgrd.c
+++ b/repmgrd.c
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile
-#
+# Copyright (c) 2ndQuadrant, 2010
 # Copyright (c) 2ndQuadrant, 2010-2017
 #
 MODULE_big = repmgr_funcs
--- a/sql/repmgr2_repmgr3.sql
+++ b/sql/repmgr2_repmgr3.sql
@@ -1,85 +0,0 @@
 /*
 * Update a repmgr 2.x installation to repmgr 3.0
 * ----------------------------------------------
 *
 * 1. Stop any running repmgrd instances
 * 2. On the master node, execute the SQL statements listed below,
 *    taking care to identify the master node and any inactive
 *    nodes
 * 3. Restart repmgrd (being sure to use repmgr 3.0)
 */
 /*
 * Set the search path to the name of the schema used by
 * your repmgr installation
 * (this should be "repmgr_" + the cluster name defined in
 * 'repmgr.conf')
 */
 -- SET search_path TO 'name_of_repmgr_schema';
 BEGIN;
 ALTER TABLE repl_nodes RENAME TO repl_nodes2_0;
 CREATE TABLE repl_nodes (
  id               INTEGER PRIMARY KEY,
  type             TEXT    NOT NULL CHECK (type IN('master','standby','witness')),
  upstream_node_id INTEGER NULL REFERENCES repl_nodes (id),
  cluster          TEXT    NOT NULL,
  name             TEXT    NOT NULL,
  conninfo         TEXT    NOT NULL,
  slot_name        TEXT    NULL,
  priority         INTEGER NOT NULL,
  active           BOOLEAN NOT NULL DEFAULT TRUE
 );
 INSERT INTO repl_nodes
           (id, type, cluster, name, conninfo, priority)
     SELECT id,
            CASE
               WHEN witness IS TRUE THEN 'witness'
               ELSE 'standby'
            END AS type,
            cluster,
            name,
            conninfo,
            priority + 100
       FROM repl_nodes2_0;
 /*
 * You'll need to set the master explicitly; the following query
 * should identify the master node ID but will only work if all
 * standby servers are connected:
 *
 * SELECT id FROM repmgr_test.repl_nodes WHERE name NOT IN (SELECT application_name FROM pg_stat_replication)
 *
 * If in doubt, execute 'repmgr cluster show' will definitively identify
 * the master.
 */
 UPDATE repl_nodes SET type = 'master' WHERE id = $master_id;
 /* If any nodes are known to be inactive, update them here */
 -- UPDATE repl_nodes SET active = FALSE WHERE id IN (...);
 /* There's also an event table which we need to create */
 CREATE TABLE repl_events (
  node_id          INTEGER NOT NULL,
  event            TEXT NOT NULL,
  successful       BOOLEAN NOT NULL DEFAULT TRUE,
  event_timestamp  TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
  details          TEXT NULL
 );
 /* When you're sure of your changes, commit them */
 -- COMMIT;
 /*
 * execute the following command when you are sure you no longer
 * require the old table:
 */
 -- DROP TABLE repl_nodes2_0;
--- a/sql/repmgr3.0_repmgr3.1.sql
+++ b/sql/repmgr3.0_repmgr3.1.sql
@@ -1,35 +0,0 @@
 /*
 * Update a repmgr 3.0 installation to repmgr 3.1
 * ----------------------------------------------
 *
 * The new repmgr package should be installed first. Then
 * carry out these steps:
 *
 *   1. (If repmgrd is used) stop any running repmgrd instances
 *   2. On the master node, execute the SQL statements listed below
 *   3. (If repmgrd is used) restart repmgrd
 */
 /*
 * If your repmgr installation is not included in your repmgr
 * user's search path, please set the search path to the name
 * of the repmgr schema to ensure objects are installed in
 * the correct location.
 *
 * The repmgr schema is  "repmgr_" + the cluster name defined in
 * 'repmgr.conf'.
 */
 -- SET search_path TO 'name_of_repmgr_schema';
 BEGIN;
 -- New view "repl_show_nodes" which also displays the server's
 -- upstream node
 CREATE VIEW repl_show_nodes AS
 SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
 	rn.priority, rn.active, sq.name AS upstream_node_name
 FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
 COMMIT;
--- a/sql/repmgr3.1.1_repmgr3.1.2.sql
+++ b/sql/repmgr3.1.1_repmgr3.1.2.sql
@@ -1,32 +0,0 @@
 /*
 * Update a repmgr 3.1.1 installation to repmgr 3.1.2
 * --------------------------------------------------
 *
 * This update is only required if repmgrd is being used in conjunction
 * with a witness server.
 *
 * The new repmgr package should be installed first. Then
 * carry out these steps:
 *
 *   1. (If repmgrd is used) stop any running repmgrd instances
 *   2. On the master node, execute the SQL statement listed below
 *   3. (If repmgrd is used) restart repmgrd
 */
 /*
 * If your repmgr installation is not included in your repmgr
 * user's search path, please set the search path to the name
 * of the repmgr schema to ensure objects are installed in
 * the correct location.
 *
 * The repmgr schema is  "repmgr_" + the cluster name defined in
 * 'repmgr.conf'.
 */
 -- SET search_path TO 'name_of_repmgr_schema';
 BEGIN;
 ALTER TABLE repl_nodes DROP CONSTRAINT repl_nodes_upstream_node_id_fkey,
      ADD CONSTRAINT repl_nodes_upstream_node_id_fkey FOREIGN KEY (upstream_node_id) REFERENCES repl_nodes(id) DEFERRABLE;
 COMMIT;
--- a/sql/repmgr_funcs.c
+++ b/sql/repmgr_funcs.c
@@ -9,7 +9,6 @@
 #include "fmgr.h"
 #include "access/xlog.h"
 #include "miscadmin.h"
 #include "replication/walreceiver.h"
 #include "storage/ipc.h"
 #include "storage/lwlock.h"
 #include "storage/procarray.h"
@@ -59,7 +58,6 @@ PG_FUNCTION_INFO_V1(repmgr_update_last_updated);
 PG_FUNCTION_INFO_V1(repmgr_get_last_updated);
 /*
 * Module load callback
 */
@@ -83,12 +81,7 @@ _PG_init(void)
 	 * resources in repmgr_shmem_startup().
 	 */
 	RequestAddinShmemSpace(repmgr_memsize());
 #if (PG_VERSION_NUM >= 90600)
 	RequestNamedLWLockTranche("repmgr", 1);
 #else
 	RequestAddinLWLocks(1);
 #endif
 	/*
 	 * Install hooks.
@@ -133,11 +126,7 @@ repmgr_shmem_startup(void)
 	if (!found)
 	{
 		/* First time through ... */
 #if (PG_VERSION_NUM >= 90600)
 		shared_state->lock = &(GetNamedLWLockTranche("repmgr"))->lock;
 #else
 		shared_state->lock = LWLockAssign();
 #endif
 		snprintf(shared_state->location,
 				 sizeof(shared_state->location), "%X/%X", 0, 0);
 	}
@@ -241,5 +230,3 @@ repmgr_get_last_updated(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMESTAMPTZ(last_updated);
 }
--- a/sql/repmgr_funcs.sql.in
+++ b/sql/repmgr_funcs.sql.in
@@ -1,6 +1,6 @@
 /*
 * repmgr_function.sql
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2014
 *
 */
--- a/sql/repmgr_test.sql
+++ b/sql/repmgr_test.sql
@@ -1,4 +0,0 @@
 select * from repmgr_update_standby_location('');
 select * from repmgr_get_last_standby_location();
 select * from repmgr_update_last_updated();
 select * from repmgr_get_last_updated();
--- a/sql/uninstall_repmgr_funcs.sql
+++ b/sql/uninstall_repmgr_funcs.sql
@@ -1,6 +1,6 @@
 /*
 * uninstall_repmgr_funcs.sql
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (c) 2ndQuadrant, 2010-2014
 *
 */
--- a/strutil.c
+++ b/strutil.c
@@ -1,7 +1,7 @@
 /*
 * strutil.c
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -87,21 +87,3 @@ maxlen_snprintf(char *str, const char *format,...)
 	return retval;
 }
 /*
 * Escape a string for use as a parameter in recovery.conf
 * Caller must free returned value
 */
 char *
 escape_recovery_conf_value(const char *src)
 {
 	char	   *result = escape_single_quotes_ascii(src);
 	if (!result)
 	{
 		fprintf(stderr, _("%s: out of memory\n"), progname());
 		exit(ERR_INTERNAL);
 	}
 	return result;
 }
--- a/strutil.h
+++ b/strutil.h
@@ -1,6 +1,6 @@
 /*
 * strutil.h
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,20 +22,14 @@
 #define _STRUTIL_H_
 #include <stdlib.h>
 #include "pqexpbuffer.h"
 #include "errcode.h"
 #define QUERY_STR_LEN	8192
 #define MAXLEN			1024
 #define MAXLINELENGTH	4096
 #define MAXVERSIONSTR	16
 #define MAXCONNINFO		1024
 /* Why? http://stackoverflow.com/a/5459929/398670 */
 #define STR(x) CppAsString(x)
 #define MAXLEN_STR STR(MAXLEN)
 extern int
 xsnprintf(char *str, size_t size, const char *format,...)
@@ -49,6 +43,4 @@ extern int
 maxlen_snprintf(char *str, const char *format,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
 extern char *
 escape_recovery_conf_value(const char *src);
 #endif   /* _STRUTIL_H_ */
--- a/uninstall_repmgr.sql
+++ b/uninstall_repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * uninstall_repmgr.sql
 *
- * Copyright (c) 2ndQuadrant, 2010-2017
+ * Copyright (C) 2ndQuadrant, 2010-2014
 *
 */
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-#define REPMGR_VERSION "3.4.0"
+#define REPMGR_VERSION "2.0.2"
 #endif
Author	SHA1	Message	Date
Ian Barwick	51aa63c8f9	Update version and history for minor release 2.0.2	2015-02-17 16:06:00 +09:00
Ian Barwick	e53162deb8	Fix master port check Check introduced in `dc0dfe9b56` was comparing the provided database name instead of the port.	2015-02-12 14:43:53 +09:00
Jaime Casanova	6a8336b880	Add "--checksum" in rsync when using "--force" If the user don't put that option in rsync_options using of "--force" could be unsafe. While the probability of failures because of this are low they aren't zero.	2015-02-10 20:28:17 -05:00
Marco Nenciarini	4a445e7f8a	Fix syntax errors in repmgr.c	2014-11-10 12:38:18 -05:00
Jaime Casanova	3c1d72a5ea	Code review: Do not use psql on do_witness_create, use createdb and createuser binaries instead	2014-11-10 12:37:10 -05:00
Martín Marqués	d4b9a32a86	errcode.h is a local header.	2014-11-10 12:36:17 -05:00
Martín Marqués	07a216ca25	If the user doesn't pass the port on which the primary server is listening we have to assume it's the DEFAULT_MASTER_PORT. This was not done, so we added a check to see if it has a value that is usable, else we use DEFAULT_MASTER_PORT.	2014-11-10 12:34:30 -05:00
Ian Barwick	d3c067f1bd	Clarify repmgr database role Conflicts: QUICKSTART.md	2014-11-10 12:33:26 -05:00
Ian Barwick	e6caf11bf2	Fix pg_hba.conf example Conflicts: QUICKSTART.md	2014-11-10 12:30:33 -05:00
Ian Barwick	9909881d81	Update HISTORY for minor release 2.0.1	2014-11-10 12:27:07 -05:00
Ian Barwick	8073a294f0	Formatting fixes Conflicts: QUICKSTART.md	2014-11-10 12:26:28 -05:00
Ian Barwick	bf5e0b9b48	Correct year in specfile changelog	2014-11-10 12:21:49 -05:00
Ian Barwick	2e9f4aa30f	Convert QUICKSTART file to markdown format Less effort for more consistent formatting (at least the way github renders it).	2014-11-10 12:12:25 -05:00
Ian Barwick	0dcacc3a70	Formatting fixes	2014-11-10 12:11:42 -05:00
Ian Barwick	65120c47cf	Fix formatting	2014-11-10 12:10:47 -05:00
Ian Barwick	f9397c0f06	Add a "quickstart" guide Provides a succinct overview of the steps needed to get repmgr up and running as.	2014-11-10 12:04:02 -05:00
Ian Barwick	af3c865b05	Fix log messages in do_standby_promote() Initial connection is to current standby, before attempting to connect to old master.	2014-11-10 10:44:55 -05:00
Ian Barwick	112a11a311	Typo fixes	2014-11-10 10:42:39 -05:00
Ian Barwick	7b87b5eddd	Change successful standby promotion message to log level 'NOTICE' Was previously 'ERROR'.	2014-11-10 10:40:31 -05:00
Ian Barwick	1aa36ca1c1	Properly specify rsync --exclude directories Using '--exclude=dirname/' to explicitly specify directories whose contents should not be copied. This will result in empty directories being created on the destination if they exist on the source, but that's not a problem as they are needed anyway. Previously the generated rsync command contained '--exclude=pg_log', which will break replication on 9.5 as the wildcard expansion prevents the 'pg_logical' directory from being copied.	2014-11-09 18:16:08 -05:00
Ian Barwick	a7eff1f39e	Typo fixes and minor wording tweaks for clarity	2014-11-09 17:25:47 -05:00
Riegie Godwin Jeyaranchen	e64e230559	Update README.rst Fixing a grammar mistake.	2014-11-09 17:15:42 -05:00
Nathan Van Overloop	bba167db9e	init script: make status call return proper return code	2014-11-09 11:13:47 -05:00
Nathan Van Overloop	2676adcaed	re-add comment full debug of log.c	2014-11-09 11:04:39 -05:00
Nathan Van Overloop	5a27d5e57b	on init of witness server create db and user to avoid using postgres	2014-11-09 10:55:09 -05:00
Nathan Van Overloop	4071589ba5	adapt makefile for RHEL + RHEL specific files	2014-11-09 10:51:40 -05:00
brynhood	6cb2376974	Makefile: create bindir before instal + force dir in order to facilitate building of an rpm I've added an / to the end of the dirs.	2014-11-07 15:25:45 -05:00
PriceChild	235c98a0b5	Typo in example command.	2014-11-07 15:13:23 -05:00
Warren Moore	16da2f48c2	keep naming consistent	2014-11-07 15:12:49 -05:00
Warren Moore	c23e5858f2	fix: witness creation and monitoring While reading node entries from master use a separate PGresult when inserting into witness. Witness monitoring supplies a null value for 'last_apply_time'.	2014-11-07 15:09:05 -05:00
József Kószó	30ccee43d9	debian init script and config file documentation fixes	2014-11-07 15:02:27 -05:00
József Kószó	9357f89d12	debian init script and config file documentation fixes	2014-11-07 15:02:03 -05:00
József Kószó	48da11acfd	debian init script and config file documentation fixes	2014-11-07 14:40:53 -05:00
Christian Kruse	07c54c296c	removed old comment	2014-11-07 13:49:13 -05:00
Christian Kruse	8f0b9592e8	no longer use global variable for SQL query buffer	2014-11-07 13:47:58 -05:00
Christian Kruse	b35bf3f91d	removed no-longer used variable	2014-11-07 13:47:18 -05:00
Christian Kruse	04c101c5f0	rather big refactoring: use a naming scheme In the past naming of functions, variables and such didn't really have a naming scheme. Now they should have. This is backpatched from master (2.1dev) just because it will be easier to backpatch other fixes.	2014-11-07 13:46:04 -05:00
Christian Kruse	65989840d2	avoid usage of snprintf() We have a nice little abstraction for snprintf with covering the case that a string is too big for the target buffer – let's use that!	2014-11-07 13:44:23 -05:00
Christian Kruse	24bd4e7a3f	completely avoid usage of strnlen()	2014-11-07 13:40:20 -05:00
Christian Kruse	1c67e105ff	pg_indent'ing all files… Conflicts: version.h	2014-11-07 13:32:29 -05:00
Christian Kruse	069f9ff2ed	version push	2014-03-17 14:26:56 +01:00
Christian Kruse	b8ade8e908	fixing some documentation errors	2014-03-10 15:51:55 +01:00
Christian Kruse	c0abb3be31	Merge branch 'master' into REL2_0_STABLE	2014-03-06 15:23:52 +01:00
Christian Kruse	0a71123920	Merge branch 'master' into REL2_0_STABLE	2014-03-03 09:25:08 +01:00
Christian Kruse	a72c2296e9	Merge branch 'master' into REL2_0_STABLE	2014-02-11 09:28:40 +01:00
Christian Kruse	9c3d79147b	now version.h contains the right version	2014-02-07 21:47:39 +01:00
		`@@ -1 +0,0 @@`
			`The contents of this file have been incorporated into the main README.md document.`