[GEOS-11141] Provide context for use of environment variables and sys…

…tem properties # Conflicts: # doc/en/user/source/production/config.rst
geoserver · Mar 30, 2024 · 2b460b4 · 2b460b4
1 parent 4c48f4e
commit 2b460b4
Show file tree

Hide file tree

Showing 7 changed files with 656 additions and 78 deletions.
diff --git a/doc/en/user/source/configuration/globalsettings.rst b/doc/en/user/source/configuration/globalsettings.rst
@@ -17,14 +17,23 @@ Global Settings are used to configure how OGC Web Services function.
 Service Settings
 ^^^^^^^^^^^^^^^^
 
-.. _config_globalsettings_proxy_base:
+.. _proxy_base:
 
 Proxy Base URL
 ''''''''''''''
 
 GeoServer can have the capabilities documents report a proxy properly. "The Proxy Base URL" field is the base URL seen beyond a reverse proxy.
 
-The Proxy Base URL field support environment parametrization (see :ref:`Parameterize catalog settings <datadir_configtemplate>` ) by activating the JVM parameter::
+This setting is available in the Administration Console and REST API by GeoServer Administrator. This setting may also be managed using the ``PROXY_BASE_URL`` :ref`application property <application_properties>` defined by a System Administrator.
+
+.. code-block::bash
+
+    -DPROXY_BASE_URL=https://example.net/geoserver
+    
+
+The Proxy Base URL field support environment parametrization (see :ref:`Parameterize catalog settings <datadir_configtemplate>` ) by activating the JVM parameter:
+
+.. code-block::bash
 
     -DALLOW_ENV_PARAMETRIZATION=true
 

diff --git a/doc/en/user/source/configuration/index.rst b/doc/en/user/source/configuration/index.rst
@@ -21,4 +21,5 @@ It also describes how to view the GeoServer instance status.
    virtual-services
    internationalization/index
    demos/index
-   tools/index
+   tools/index
+   properties/index
diff --git a/doc/en/user/source/configuration/logging.rst b/doc/en/user/source/configuration/logging.rst
@@ -178,6 +178,8 @@ Copy built-in logging profile and customize:
 
 5. This result provides minimal feedback to the console, only reporting when GeoServer encounters an error.
 
+.. _logging_location:
+
 Overriding the log location setup in the GeoServer configuration
 ----------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,6 +178,8 @@ Copy built-in logging profile and customize: @@
 . This result provides minimal feedback to the console, only reporting when GeoServer encounters an error.
+    .. _logging_location:
     Overriding the log location setup in the GeoServer configuration
     ----------------------------------------------------------------
@@ Expand Down @@