Skip to content

Commit

Permalink
Move S3 initialization in user guide quickstart.
Browse files Browse the repository at this point in the history
The previous location was too late to allow --var=s3-all=y to work with --require=/repo-host, which depends on /quickstart/configure-archiving.

Since the section is not included in production documentation, the position is not very important to flow so just move it to where it works.
  • Loading branch information
dwsteele committed May 3, 2020
1 parent ef93249 commit 64a2192
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions doc/xml/user-guide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,18 @@
</backrest-config>
</section>

<!-- =================================================================================================================== -->
<section id="s3-support" if="'{[s3-all]}' eq 'y'">
<title>S3-Compatible Object Store Support</title>

<block id="s3-setup">
<block-variable-replace key="s3-setup-host">{[host-pg1]}</block-variable-replace>
<block-variable-replace key="s3-setup-user">postgres</block-variable-replace>
<block-variable-replace key="s3-setup-config-owner">postgres:postgres</block-variable-replace>
<block-variable-replace key="s3-setup-create-bucket">y</block-variable-replace>
</block>
</section>

<!-- SECTION => QUICKSTART - CONFIGURE ARCHIVING -->
<section id="configure-archiving">
<title>Configure Archiving</title>
Expand Down Expand Up @@ -1035,17 +1047,6 @@
<p>Once the repository has been configured and the stanza created and checked, the repository encryption settings cannot be changed.</p>
</section>

<section id="s3-support" if="'{[s3-all]}' eq 'y'">
<title>S3-Compatible Object Store Support</title>

<block id="s3-setup">
<block-variable-replace key="s3-setup-host">{[host-pg1]}</block-variable-replace>
<block-variable-replace key="s3-setup-user">postgres</block-variable-replace>
<block-variable-replace key="s3-setup-config-owner">postgres:postgres</block-variable-replace>
<block-variable-replace key="s3-setup-create-bucket">y</block-variable-replace>
</block>
</section>

<!-- SECTION => QUICKSTART - STANZA CREATE -->
<section id="create-stanza">
<title>Create the Stanza</title>
Expand Down

0 comments on commit 64a2192

Please sign in to comment.