From d13714b973222e5a1973dd801f1cb573048b9237 Mon Sep 17 00:00:00 2001
From: Melvin mngmt-02 <melvin@suter.dev>
Date: Fri, 13 Oct 2023 16:34:25 +0200
Subject: [PATCH] backwards compatibility

Signed-off-by: Melvin mngmt-02 <melvin@suter.dev>
Signed-off-by: Melvin Suter <github@suter.dev>
---
 25/apache/config/trusteddomains.config.php     | 6 +++++-
 25/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 25/fpm/config/trusteddomains.config.php        | 6 +++++-
 26/apache/config/trusteddomains.config.php     | 6 +++++-
 26/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 26/fpm/config/trusteddomains.config.php        | 6 +++++-
 27/apache/config/trusteddomains.config.php     | 6 +++++-
 27/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 27/fpm/config/trusteddomains.config.php        | 6 +++++-
 9 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/apache/config/trusteddomains.config.php
+++ b/25/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/fpm-alpine/config/trusteddomains.config.php
+++ b/25/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/fpm/config/trusteddomains.config.php
+++ b/25/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/apache/config/trusteddomains.config.php
+++ b/26/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/fpm-alpine/config/trusteddomains.config.php
+++ b/26/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/fpm/config/trusteddomains.config.php
+++ b/26/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/apache/config/trusteddomains.config.php
+++ b/27/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/fpm-alpine/config/trusteddomains.config.php
+++ b/27/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/fpm/config/trusteddomains.config.php
+++ b/27/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }