Merge commit 'b5019b4148663e1810991c3ff337d16f3ba9c812' into PGPRO10

Author: vbwagner

contrib/pg_probackup/README.md

@@ -42,6 +42,24 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 * Configuration files outside of PostgreSQL data directory are not included into the backup and should be backed up separately.
 
 ## Installation and Setup
+### Linux Installation
+```shell
+#DEB Ubuntu|Debian Packages
+echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
+wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | apt-key add - && apt-get update
+apt-get install pg-probackup-(10|9.6|9.5)
+
+#DEB-SRC Packages
+echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
+  /etc/apt/sources.list.d/pg_probackup.list
+
+#RPM Centos Packages
+rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
+yum install pg_probackup-(10|9.6|9.5)
+
+#SRPM Centos Packages
+yumdownloader --source pg_probackup-(10|9.6|9.5)
+```
 
 To compile `pg_probackup`, you must have a PostgreSQL installation and raw source tree. To install `pg_probackup`, execute this in the module's directory:
 

contrib/pg_probackup/src/archive.c

@@ -63,9 +63,10 @@ do_archive_push(char *wal_file_path, char *wal_file_name, bool overwrite)
 
 	elog(INFO, "pg_probackup archive-push from %s to %s", absolute_wal_file_path, backup_wal_file_path);
 
-#ifdef HAVE_LIBZ
 	if (compress_alg == PGLZ_COMPRESS)
 		elog(ERROR, "pglz compression is not supported");
+
+#ifdef HAVE_LIBZ
 	if (compress_alg == ZLIB_COMPRESS)
 		is_compress = IsXLogFileName(wal_file_name);
 #endif