db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-14 10:13:05 +02:00
Code Issues Releases Activity

Improve S3 server implementation in documentation.

Browse Source
This commit is contained in:
David Steele 2017-06-23 10:10:48 -04:00
parent eb4325fa9a
commit 3d224ad8fa
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -219,6 +219,10 @@
<release-item> <release-item>
<p>Remove exhaustive version list from Stable Releases TOC.</p> <p>Remove exhaustive version list from Stable Releases TOC.</p>
</release-item> </release-item>
<release-item>
<p>Improve <proper>S3</proper> server implementation in documentation.</p>
</release-item>
</release-refactor-list> </release-refactor-list>
</release-doc-list> </release-doc-list>

12
doc/xml/user-guide.xml
View File

@ -65,6 +65,8 @@
<variable key="host-mount">/backrest:/backrest</variable> <variable key="host-mount">/backrest:/backrest</variable>
<variable key="image-repo">pgbackrest/test</variable> <variable key="image-repo">pgbackrest/test</variable>
<variable key="host-s3-server">s3-server</variable>
<variable key="host-db-master">db-master</variable> <variable key="host-db-master">db-master</variable>
<variable key="host-db-master-user">{[host-user]}</variable> <variable key="host-db-master-user">{[host-user]}</variable>
<variable key="host-db-master-image">{[image-repo]}:{[host-os]}-db-{[pg-version]}-doc</variable> <variable key="host-db-master-image">{[image-repo]}:{[host-os]}-db-{[pg-version]}-doc</variable>
@ -171,7 +173,7 @@
<title>Installation</title> <title>Installation</title>
<!-- Create S3 server first to allow it time to boot before being used --> <!-- Create S3 server first to allow it time to boot before being used -->
<host-add name="demo-bucket.s3.amazonaws.com" user="root" image="{[image-repo]}:{[host-os]}-s3-server" os="{[host-os]}"> <host-add name="{[host-s3-server]}" user="root" image="{[image-repo]}:{[host-os]}-s3-server" os="{[host-os]}">
</host-add> </host-add>
<host-add name="{[host-db-master]}" user="{[host-db-master-user]}" image="{[host-db-master-image]}" os="{[host-os]}" mount="{[host-db-master-mount]}"> <host-add name="{[host-db-master]}" user="{[host-db-master-user]}" image="{[host-db-master-image]}" os="{[host-os]}" mount="{[host-db-master-mount]}">
@ -1351,7 +1353,13 @@
<execute-list host="{[host-db-master]}"> <execute-list host="{[host-db-master]}">
<title>Create the stanza</title> <title>Create the stanza</title>
<execute user="{[host-user]}"> <!-- set host entries to redirect aws to local s3 server -->
<execute user="root" show='n'>
<exe-cmd>echo "{[host-s3-server-ip]} demo-bucket.s3.amazonaws.com s3.amazonaws.com" |
sudo tee -a /etc/hosts</exe-cmd>
</execute>
<execute user="{[host-user]}" show='n'>
<exe-cmd>aws s3 --no-verify-ssl mb s3://demo-bucket 2>&amp;1</exe-cmd> <exe-cmd>aws s3 --no-verify-ssl mb s3://demo-bucket 2>&amp;1</exe-cmd>
</execute> </execute>