From 1db03bdb57a81997fdf4c72fef1e39bc4f8afa6c Mon Sep 17 00:00:00 2001
From: Wolfgang Kaltz <wolfgang.kaltz@camptocamp.com>
Date: Thu, 12 Sep 2024 13:29:35 +0200
Subject: [PATCH 1/3] Documentation: improve instructions for scaling
 configuration

---
 .../src/main/resources/templates/scaling.html | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/docs/src/main/resources/templates/scaling.html b/docs/src/main/resources/templates/scaling.html
index 5a585674e9..ff2309eaa9 100644
--- a/docs/src/main/resources/templates/scaling.html
+++ b/docs/src/main/resources/templates/scaling.html
@@ -11,9 +11,12 @@ <h4 id="scaling_solus">
   <a class="headerlink" href="#scaling_solus" title="Permalink to this headline">¶</a>
 </h4>
 <p>
-  To store the state we use a PostgreSQL database, the database connection should be configured with the
-  following Java system properties:
+  MapFish-Print's horizontal scaling solution is based on storing states in a PostgreSQL database. To enable
+  this mode, the file <code>mapfish-spring-application-context-override-db.xml</code> must be copied to
+  <code>mapfish-spring-application-context-override.xml</code> and database connection parameters must be
+  configured (see below).
 </p>
+<p>The database connection must be configured with the following Java system properties:</p>
 
 <ul>
   <li><code>db.host</code>: The database server host name</li>
@@ -25,12 +28,11 @@ <h4 id="scaling_solus">
 </ul>
 
 <p>
-  The schema should exist, and the necessary tables are created automatically (<code>print_accountings</code>,
-  <code>print_job_results</code>, <code>print_job_statuses</code>). In this mode, the container will wait for
-  the database to be reachable before actually starting the tomcat server.
+  The schema must exist, and the necessary tables are created automatically (<code>print_accountings</code>,
+  <code>print_job_results</code>, <code>print_job_statuses</code>)
 </p>
 
-<p>The DB polling can be tuned with these two environment variables:</p>
+<p>Database polling can be tuned with these two environment variables:</p>
 <ul>
   <li>
     <code>PRINT_CANCEL_OLD_POLL_INTERVAL</code>: How often in seconds the DB is polled for jobs to be canceled
@@ -43,6 +45,18 @@ <h4 id="scaling_solus">
   </li>
 </ul>
 
+<h5 ud="docker_image">
+  Existing MapFish-Print Packages
+  <a class="headerlink" href="#docker_image" title="Permalink to this headline">¶</a>
+</h5>
+<p>
+  Existing MapFish-Print distribution packages may already contain functionality to ease the setup of
+  horizontal scaling. For example, if you use the Docker image
+  https://hub.docker.com/r/camptocamp/mapfish_print), you do not need to manually rename the file mentioned
+  above, and a startup script contains functionality to verify database availability before the application
+  server is started.
+</p>
+
 <h5 id="scaling_docker">
   Docker
   <a class="headerlink" href="#scaling_docker" title="Permalink to this headline">¶</a>

From f8c2b914c852b7411040243de16511a441d2812f Mon Sep 17 00:00:00 2001
From: Wolfgang Kaltz <wolfgang.kaltz@camptocamp.com>
Date: Fri, 13 Sep 2024 14:39:29 +0200
Subject: [PATCH 2/3] Clarify db

---
 docs/src/main/resources/templates/scaling.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/main/resources/templates/scaling.html b/docs/src/main/resources/templates/scaling.html
index ff2309eaa9..68c2614eb4 100644
--- a/docs/src/main/resources/templates/scaling.html
+++ b/docs/src/main/resources/templates/scaling.html
@@ -11,8 +11,8 @@ <h4 id="scaling_solus">
   <a class="headerlink" href="#scaling_solus" title="Permalink to this headline">¶</a>
 </h4>
 <p>
-  MapFish-Print's horizontal scaling solution is based on storing states in a PostgreSQL database. To enable
-  this mode, the file <code>mapfish-spring-application-context-override-db.xml</code> must be copied to
+  MapFish-Print's horizontal scaling solution is based on storing states in a database, for example PostgreSQL.
+  To enable this mode, the file <code>mapfish-spring-application-context-override-db.xml</code> must be copied to
   <code>mapfish-spring-application-context-override.xml</code> and database connection parameters must be
   configured (see below).
 </p>

From 213bb0e1812fb1baeacfb2333bf5491ba611678a Mon Sep 17 00:00:00 2001
From: "geo-ghci-int[bot]"
 <146321879+geo-ghci-int[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 12:40:56 +0000
Subject: [PATCH 3/3] Apply pre-commit fix

From the artifact of the previous workflow run
---
 docs/src/main/resources/templates/scaling.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/src/main/resources/templates/scaling.html b/docs/src/main/resources/templates/scaling.html
index 68c2614eb4..73c618bc42 100644
--- a/docs/src/main/resources/templates/scaling.html
+++ b/docs/src/main/resources/templates/scaling.html
@@ -11,8 +11,9 @@ <h4 id="scaling_solus">
   <a class="headerlink" href="#scaling_solus" title="Permalink to this headline">¶</a>
 </h4>
 <p>
-  MapFish-Print's horizontal scaling solution is based on storing states in a database, for example PostgreSQL.
-  To enable this mode, the file <code>mapfish-spring-application-context-override-db.xml</code> must be copied to
+  MapFish-Print's horizontal scaling solution is based on storing states in a database, for example
+  PostgreSQL. To enable this mode, the file
+  <code>mapfish-spring-application-context-override-db.xml</code> must be copied to
   <code>mapfish-spring-application-context-override.xml</code> and database connection parameters must be
   configured (see below).
 </p>