Skip to content

Commit 70c0530

Browse files
committed
Merge branch 'master' into issue_150
2 parents 5f0c024 + eccd847 commit 70c0530

29 files changed

+3454
-1697
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
66

77
OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o src/data.o \
88
src/delete.o src/dir.o src/fetch.o src/help.o src/init.o src/merge.o \
9-
src/parsexlog.o src/pg_probackup.o src/restore.o src/show.o src/util.o \
9+
src/parsexlog.o src/ptrack.o src/pg_probackup.o src/restore.o src/show.o src/util.o \
1010
src/validate.o
1111

1212
# borrowed files

README.md

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
5252

5353
## Documentation
5454

55-
Documentation can be found at [github](https://github.com/postgrespro/pg_probackup/blob/master/Documentation.md).
55+
Documentation can be found at [github](https://postgrespro.github.io/pg_probackup).
5656

5757
## Installation and Setup
5858
### Windows Installation
@@ -89,42 +89,84 @@ yum install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
8989

9090
#SRPM Packages
9191
yumdownloader --source pg_probackup-{12,11,10,9.6,9.5}
92+
93+
#RPM ALT Linux p7
94+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p7 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
95+
sudo apt-get update
96+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}
97+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
98+
99+
#RPM ALT Linux p8
100+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
101+
sudo apt-get update
102+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}
103+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
104+
105+
#RPM ALT Linux p9
106+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
107+
sudo apt-get update
108+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}
109+
sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
92110
```
93111

94112
#### pg_probackup for PostgresPro Standart and Enterprise
95113
```shell
96114
#DEB Ubuntu|Debian Packages
97115
sudo echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list
98116
sudo wget -O - http://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
99-
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}
100-
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}-dbg
117+
sudo apt-get install pg-probackup-{std,ent}-{11,10,9.6}
118+
sudo apt-get install pg-probackup-{std,ent}-{11,10,9.6}-dbg
101119

102120
#RPM Centos Packages
103121
rpm -ivh http://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
104-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
105-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
122+
yum install pg_probackup-{std,ent}-{11,10,9.6}
123+
yum install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
106124

107125
#RPM RHEL Packages
108126
rpm -ivh http://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
109-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
110-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
127+
yum install pg_probackup-{std,ent}-{11,10,9.6}
128+
yum install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
111129

112130
#RPM Oracle Linux Packages
113131
rpm -ivh http://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
114-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
115-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
132+
yum install pg_probackup-{std,ent}-{11,10,9.6}
133+
yum install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
134+
135+
#RPM ALT Linux p7
136+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list
137+
sudo apt-get update
138+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}
139+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
140+
141+
#RPM ALT Linux p8
142+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list
143+
sudo apt-get update
144+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}
145+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
146+
147+
#RPM ALT Linux p9
148+
sudo echo "rpm http://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list && sudo apt-get update
149+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}
150+
sudo apt-get install pg_probackup-{std,ent}-{11,10,9.6}-debuginfo
116151
```
117152

118153
Once you have `pg_probackup` installed, complete [the setup](https://github.com/postgrespro/pg_probackup/blob/master/Documentation.md#installation-and-setup).
119154

120155
## Building from source
121156
### Linux
122157

123-
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:
158+
To compile `pg_probackup`, you must have a PostgreSQL installation and raw source tree. Execute this in the module's directory:
124159

125160
```shell
126161
make USE_PGXS=1 PG_CONFIG=<path_to_pg_config> top_srcdir=<path_to_PostgreSQL_source_tree>
127162
```
163+
164+
The alternative way, without using the PGXS infrastructure, is to place `pg_probackup` source directory into `contrib` directory and build it there. Example:
165+
166+
```shell
167+
cd <path_to_PostgreSQL_source_tree> && git clone https://github.com/postgrespro/pg_probackup contrib/pg_probackup && cd contrib/pg_probackup && make
168+
```
169+
128170
### Windows
129171

130172
Currently pg_probackup can be build using only MSVC 2013.

0 commit comments

Comments
 (0)