Merge pull request #214 from truenas/NAS-113003

NAS-113003 / 22.02-RC.2 / Add trusted_proxies env variable for nextcloud
2026-11-03 22:24:05 +08:00 · 2021-10-28 19:20:04 +05:00
parent fc894e41dc 006d541220
commit 74df3384e6
50 changed files with 4 additions and 2 deletions
--- a/charts/nextcloud/1.3.7/.helmignore
+++ b/charts/nextcloud/1.3.7/.helmignore
--- a/charts/nextcloud/1.3.7/Chart.lock
+++ b/charts/nextcloud/1.3.7/Chart.lock
--- a/charts/nextcloud/1.3.7/Chart.yaml
+++ b/charts/nextcloud/1.3.7/Chart.yaml
@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.3.6
+version: 1.3.7
--- a/charts/nextcloud/1.3.7/README.md
+++ b/charts/nextcloud/1.3.7/README.md
--- a/charts/nextcloud/1.3.7/app-readme.md
+++ b/charts/nextcloud/1.3.7/app-readme.md
--- a/charts/nextcloud/1.3.7/charts/common-2105.0.0.tgz
+++ b/charts/nextcloud/1.3.7/charts/common-2105.0.0.tgz
--- a/charts/nextcloud/1.3.7/ix_values.yaml
+++ b/charts/nextcloud/1.3.7/ix_values.yaml
--- a/charts/nextcloud/1.3.7/migrations/migrate_from_1.1.0
+++ b/charts/nextcloud/1.3.7/migrations/migrate_from_1.1.0
--- a/charts/nextcloud/1.3.7/questions.yaml
+++ b/charts/nextcloud/1.3.7/questions.yaml
--- a/charts/nextcloud/1.3.7/templates/NOTES.txt
+++ b/charts/nextcloud/1.3.7/templates/NOTES.txt
--- a/charts/nextcloud/1.3.7/templates/_nginx.tpl
+++ b/charts/nextcloud/1.3.7/templates/_nginx.tpl
--- a/charts/nextcloud/1.3.7/templates/_postgres.tpl
+++ b/charts/nextcloud/1.3.7/templates/_postgres.tpl
--- a/charts/nextcloud/1.3.7/templates/backup-postgres-config.yaml
+++ b/charts/nextcloud/1.3.7/templates/backup-postgres-config.yaml
--- a/charts/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
+++ b/charts/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
--- a/charts/nextcloud/1.3.7/templates/deployment.yaml
+++ b/charts/nextcloud/1.3.7/templates/deployment.yaml
@@ -38,6 +38,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
        {{ $envList = mustAppend $envList (dict "name" "APACHE_DISABLE_REWRITE_IP" "value" "1") }}
        {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" (printf "%v:%v" .Values.nextcloud.host .Values.service.nodePort)) }}
        {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
+        {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
        {{ end }}
        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" .Values.nextcloud.host) }}
        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-username") }}
--- a/charts/nextcloud/1.3.7/templates/nginx-configmap.yaml
+++ b/charts/nextcloud/1.3.7/templates/nginx-configmap.yaml
--- a/charts/nextcloud/1.3.7/templates/nginx-secret.yaml
+++ b/charts/nextcloud/1.3.7/templates/nginx-secret.yaml
--- a/charts/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
+++ b/charts/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
--- a/charts/nextcloud/1.3.7/templates/postgres-deployment.yaml
+++ b/charts/nextcloud/1.3.7/templates/postgres-deployment.yaml
--- a/charts/nextcloud/1.3.7/templates/postgres-secret.yaml
+++ b/charts/nextcloud/1.3.7/templates/postgres-secret.yaml
--- a/charts/nextcloud/1.3.7/templates/postgres-service.yaml
+++ b/charts/nextcloud/1.3.7/templates/postgres-service.yaml
--- a/charts/nextcloud/1.3.7/templates/secrets.yaml
+++ b/charts/nextcloud/1.3.7/templates/secrets.yaml
--- a/charts/nextcloud/1.3.7/templates/service.yaml
+++ b/charts/nextcloud/1.3.7/templates/service.yaml
--- a/charts/nextcloud/1.3.7/templates/serviceaccount.yaml
+++ b/charts/nextcloud/1.3.7/templates/serviceaccount.yaml
--- a/charts/nextcloud/1.3.7/test_values.yaml
+++ b/charts/nextcloud/1.3.7/test_values.yaml
--- a/test/nextcloud/1.3.7/.helmignore
+++ b/test/nextcloud/1.3.7/.helmignore
--- a/test/nextcloud/1.3.7/Chart.lock
+++ b/test/nextcloud/1.3.7/Chart.lock
--- a/test/nextcloud/1.3.7/Chart.yaml
+++ b/test/nextcloud/1.3.7/Chart.yaml
@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.3.6
+version: 1.3.7
--- a/test/nextcloud/1.3.7/README.md
+++ b/test/nextcloud/1.3.7/README.md
--- a/test/nextcloud/1.3.7/app-readme.md
+++ b/test/nextcloud/1.3.7/app-readme.md
--- a/test/nextcloud/1.3.7/charts/common-2105.0.0.tgz
+++ b/test/nextcloud/1.3.7/charts/common-2105.0.0.tgz
--- a/test/nextcloud/1.3.7/ix_values.yaml
+++ b/test/nextcloud/1.3.7/ix_values.yaml
--- a/test/nextcloud/1.3.7/migrations/migrate_from_1.1.0
+++ b/test/nextcloud/1.3.7/migrations/migrate_from_1.1.0
--- a/test/nextcloud/1.3.7/questions.yaml
+++ b/test/nextcloud/1.3.7/questions.yaml
--- a/test/nextcloud/1.3.7/templates/NOTES.txt
+++ b/test/nextcloud/1.3.7/templates/NOTES.txt
--- a/test/nextcloud/1.3.7/templates/_nginx.tpl
+++ b/test/nextcloud/1.3.7/templates/_nginx.tpl
--- a/test/nextcloud/1.3.7/templates/_postgres.tpl
+++ b/test/nextcloud/1.3.7/templates/_postgres.tpl
--- a/test/nextcloud/1.3.7/templates/backup-postgres-config.yaml
+++ b/test/nextcloud/1.3.7/templates/backup-postgres-config.yaml
--- a/test/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
+++ b/test/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
--- a/test/nextcloud/1.3.7/templates/deployment.yaml
+++ b/test/nextcloud/1.3.7/templates/deployment.yaml
@@ -38,6 +38,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
        {{ $envList = mustAppend $envList (dict "name" "APACHE_DISABLE_REWRITE_IP" "value" "1") }}
        {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" (printf "%v:%v" .Values.nextcloud.host .Values.service.nodePort)) }}
        {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
+        {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
        {{ end }}
        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" .Values.nextcloud.host) }}
        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-username") }}
--- a/test/nextcloud/1.3.7/templates/nginx-configmap.yaml
+++ b/test/nextcloud/1.3.7/templates/nginx-configmap.yaml
--- a/test/nextcloud/1.3.7/templates/nginx-secret.yaml
+++ b/test/nextcloud/1.3.7/templates/nginx-secret.yaml
--- a/test/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
+++ b/test/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
--- a/test/nextcloud/1.3.7/templates/postgres-deployment.yaml
+++ b/test/nextcloud/1.3.7/templates/postgres-deployment.yaml
--- a/test/nextcloud/1.3.7/templates/postgres-secret.yaml
+++ b/test/nextcloud/1.3.7/templates/postgres-secret.yaml
--- a/test/nextcloud/1.3.7/templates/postgres-service.yaml
+++ b/test/nextcloud/1.3.7/templates/postgres-service.yaml
--- a/test/nextcloud/1.3.7/templates/secrets.yaml
+++ b/test/nextcloud/1.3.7/templates/secrets.yaml
--- a/test/nextcloud/1.3.7/templates/service.yaml
+++ b/test/nextcloud/1.3.7/templates/service.yaml
--- a/test/nextcloud/1.3.7/templates/serviceaccount.yaml
+++ b/test/nextcloud/1.3.7/templates/serviceaccount.yaml
--- a/test/nextcloud/1.3.7/test_values.yaml
+++ b/test/nextcloud/1.3.7/test_values.yaml