From a16b4f71ccc1949b7e9191a5b389436de45b0424 Mon Sep 17 00:00:00 2001
From: Melvin mngmt-02 <melvin@suter.dev>
Date: Fri, 13 Oct 2023 16:14:17 +0200
Subject: [PATCH 1/3] making NEXTCLOUD_TRUSTED_DOMAINS after install

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

diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    '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
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}

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 2/3] 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'))))
   );
 }

From 5a8fe00c14120f7a4b6f4fdfb4f404cd132d9f1c Mon Sep 17 00:00:00 2001
From: Melvin Suter <github@suter.dev>
Date: Mon, 16 Oct 2023 11:15:40 +0200
Subject: [PATCH 3/3] Moving Config file to right dir

Signed-off-by: Melvin Suter <github@suter.dev>
---
 .../config => .config}/trusteddomains.config.php      |  0
 25/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 25/fpm/config/trusteddomains.config.php               | 11 -----------
 26/apache/config/trusteddomains.config.php            | 11 -----------
 26/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 26/fpm/config/trusteddomains.config.php               | 11 -----------
 27/apache/config/trusteddomains.config.php            | 11 -----------
 27/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 27/fpm/config/trusteddomains.config.php               | 11 -----------
 9 files changed, 88 deletions(-)
 rename {25/apache/config => .config}/trusteddomains.config.php (100%)
 delete mode 100644 25/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 25/fpm/config/trusteddomains.config.php
 delete mode 100644 26/apache/config/trusteddomains.config.php
 delete mode 100644 26/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 26/fpm/config/trusteddomains.config.php
 delete mode 100644 27/apache/config/trusteddomains.config.php
 delete mode 100644 27/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 27/fpm/config/trusteddomains.config.php

diff --git a/25/apache/config/trusteddomains.config.php b/.config/trusteddomains.config.php
similarity index 100%
rename from 25/apache/config/trusteddomains.config.php
rename to .config/trusteddomains.config.php
diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/25/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/25/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/26/apache/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/26/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/26/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/27/apache/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/27/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    '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
deleted file mode 100644
index 5994628b..00000000
--- a/27/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}