From f77c37c4fce3ed35ba68586fc61a224240e79c74 Mon Sep 17 00:00:00 2001 From: Jon Cahill-Torre Date: Thu, 24 Oct 2024 15:25:55 +0100 Subject: [PATCH 1/2] docs: update configuration:applications --- source/configuration/index.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/configuration/index.rst b/source/configuration/index.rst index a8c6ff95..de023cc3 100644 --- a/source/configuration/index.rst +++ b/source/configuration/index.rst @@ -3298,6 +3298,16 @@ shared between all application languages: - String-valued object; environment variables to be passed to the app. + Unit passes the environment variables to the app without modification, + even if no enviroment configuration object is specified. + + Any data specified in the **environment** object gets merged to the + existing environment variables. + + If an environment variable already exists in the system and gets declared + in the object, the object's value takes precendence and gets passed to + the application. + * - **group** - String; group name that runs the From 728460e99b9742c1fb420c2c5e29b48b089506a6 Mon Sep 17 00:00:00 2001 From: Jon Torre <78599298+Jcahilltorre@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:44:43 +0100 Subject: [PATCH 2/2] Update source/configuration/index.rst Co-authored-by: Gabor Javorszky --- source/configuration/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configuration/index.rst b/source/configuration/index.rst index de023cc3..e6e2dc81 100644 --- a/source/configuration/index.rst +++ b/source/configuration/index.rst @@ -3305,7 +3305,7 @@ shared between all application languages: existing environment variables. If an environment variable already exists in the system and gets declared - in the object, the object's value takes precendence and gets passed to + in this object, the object's value takes precedence and gets passed to the application. * - **group**