From a16b4f71ccc1949b7e9191a5b389436de45b0424 Mon Sep 17 00:00:00 2001 From: Melvin mngmt-02 Date: Fri, 13 Oct 2023 16:14:17 +0200 Subject: [PATCH 1/4] making NEXTCLOUD_TRUSTED_DOMAINS after install Signed-off-by: Melvin mngmt-02 Signed-off-by: Melvin Suter --- 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 @@ + 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 Date: Fri, 13 Oct 2023 16:34:25 +0200 Subject: [PATCH 2/4] backwards compatibility Signed-off-by: Melvin mngmt-02 Signed-off-by: Melvin Suter --- 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 Date: Mon, 16 Oct 2023 11:15:40 +0200 Subject: [PATCH 3/4] Moving Config file to right dir Signed-off-by: Melvin Suter --- .../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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} From d5c6e2ff0ec45631163153d22db03bca4bc65513 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 23 Dec 2024 09:03:54 -0500 Subject: [PATCH 4/4] docs(readme): Add community helm chart link Signed-off-by: Josh --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 152489b2..6745faa3 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nextcloud/docker) ![GitHub contributors](https://img.shields.io/github/contributors/nextcloud/docker?label=contributors%20-%20Thank%20you!) ![Docker Pulls](https://img.shields.io/docker/pulls/library/nextcloud) +[![Helm](https://img.shields.io/badge/Helm-0F1689?logo=helm&logoColor=fff)](https://github.com/nextcloud/helm/?tab=readme-ov-file) # What is Nextcloud?