Jelajahi Sumber

Merge pull request #214 from truenas/NAS-113003

NAS-113003 / 22.02-RC.2 / Add trusted_proxies env variable for nextcloud
Waqar Ahmed 3 tahun lalu
induk
melakukan
74df3384e6
50 mengubah file dengan 4 tambahan dan 2 penghapusan
  1. 0 0
      charts/nextcloud/1.3.7/.helmignore
  2. 0 0
      charts/nextcloud/1.3.7/Chart.lock
  3. 1 1
      charts/nextcloud/1.3.7/Chart.yaml
  4. 0 0
      charts/nextcloud/1.3.7/README.md
  5. 0 0
      charts/nextcloud/1.3.7/app-readme.md
  6. 0 0
      charts/nextcloud/1.3.7/charts/common-2105.0.0.tgz
  7. 0 0
      charts/nextcloud/1.3.7/ix_values.yaml
  8. 0 0
      charts/nextcloud/1.3.7/migrations/migrate_from_1.1.0
  9. 0 0
      charts/nextcloud/1.3.7/questions.yaml
  10. 0 0
      charts/nextcloud/1.3.7/templates/NOTES.txt
  11. 0 0
      charts/nextcloud/1.3.7/templates/_nginx.tpl
  12. 0 0
      charts/nextcloud/1.3.7/templates/_postgres.tpl
  13. 0 0
      charts/nextcloud/1.3.7/templates/backup-postgres-config.yaml
  14. 0 0
      charts/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
  15. 1 0
      charts/nextcloud/1.3.7/templates/deployment.yaml
  16. 0 0
      charts/nextcloud/1.3.7/templates/nginx-configmap.yaml
  17. 0 0
      charts/nextcloud/1.3.7/templates/nginx-secret.yaml
  18. 0 0
      charts/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
  19. 0 0
      charts/nextcloud/1.3.7/templates/postgres-deployment.yaml
  20. 0 0
      charts/nextcloud/1.3.7/templates/postgres-secret.yaml
  21. 0 0
      charts/nextcloud/1.3.7/templates/postgres-service.yaml
  22. 0 0
      charts/nextcloud/1.3.7/templates/secrets.yaml
  23. 0 0
      charts/nextcloud/1.3.7/templates/service.yaml
  24. 0 0
      charts/nextcloud/1.3.7/templates/serviceaccount.yaml
  25. 0 0
      charts/nextcloud/1.3.7/test_values.yaml
  26. 0 0
      test/nextcloud/1.3.7/.helmignore
  27. 0 0
      test/nextcloud/1.3.7/Chart.lock
  28. 1 1
      test/nextcloud/1.3.7/Chart.yaml
  29. 0 0
      test/nextcloud/1.3.7/README.md
  30. 0 0
      test/nextcloud/1.3.7/app-readme.md
  31. 0 0
      test/nextcloud/1.3.7/charts/common-2105.0.0.tgz
  32. 0 0
      test/nextcloud/1.3.7/ix_values.yaml
  33. 0 0
      test/nextcloud/1.3.7/migrations/migrate_from_1.1.0
  34. 0 0
      test/nextcloud/1.3.7/questions.yaml
  35. 0 0
      test/nextcloud/1.3.7/templates/NOTES.txt
  36. 0 0
      test/nextcloud/1.3.7/templates/_nginx.tpl
  37. 0 0
      test/nextcloud/1.3.7/templates/_postgres.tpl
  38. 0 0
      test/nextcloud/1.3.7/templates/backup-postgres-config.yaml
  39. 0 0
      test/nextcloud/1.3.7/templates/backup-postgres-hook.yaml
  40. 1 0
      test/nextcloud/1.3.7/templates/deployment.yaml
  41. 0 0
      test/nextcloud/1.3.7/templates/nginx-configmap.yaml
  42. 0 0
      test/nextcloud/1.3.7/templates/nginx-secret.yaml
  43. 0 0
      test/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml
  44. 0 0
      test/nextcloud/1.3.7/templates/postgres-deployment.yaml
  45. 0 0
      test/nextcloud/1.3.7/templates/postgres-secret.yaml
  46. 0 0
      test/nextcloud/1.3.7/templates/postgres-service.yaml
  47. 0 0
      test/nextcloud/1.3.7/templates/secrets.yaml
  48. 0 0
      test/nextcloud/1.3.7/templates/service.yaml
  49. 0 0
      test/nextcloud/1.3.7/templates/serviceaccount.yaml
  50. 0 0
      test/nextcloud/1.3.7/test_values.yaml

+ 0 - 0
charts/nextcloud/1.3.6/.helmignore → charts/nextcloud/1.3.7/.helmignore


+ 0 - 0
charts/nextcloud/1.3.6/Chart.lock → charts/nextcloud/1.3.7/Chart.lock


+ 1 - 1
charts/nextcloud/1.3.6/Chart.yaml → 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

+ 0 - 0
charts/nextcloud/1.3.6/README.md → charts/nextcloud/1.3.7/README.md


+ 0 - 0
charts/nextcloud/1.3.6/app-readme.md → charts/nextcloud/1.3.7/app-readme.md


+ 0 - 0
charts/nextcloud/1.3.6/charts/common-2105.0.0.tgz → charts/nextcloud/1.3.7/charts/common-2105.0.0.tgz


+ 0 - 0
charts/nextcloud/1.3.6/ix_values.yaml → charts/nextcloud/1.3.7/ix_values.yaml


+ 0 - 0
charts/nextcloud/1.3.6/migrations/migrate_from_1.1.0 → charts/nextcloud/1.3.7/migrations/migrate_from_1.1.0


+ 0 - 0
charts/nextcloud/1.3.6/questions.yaml → charts/nextcloud/1.3.7/questions.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/NOTES.txt → charts/nextcloud/1.3.7/templates/NOTES.txt


+ 0 - 0
charts/nextcloud/1.3.6/templates/_nginx.tpl → charts/nextcloud/1.3.7/templates/_nginx.tpl


+ 0 - 0
charts/nextcloud/1.3.6/templates/_postgres.tpl → charts/nextcloud/1.3.7/templates/_postgres.tpl


+ 0 - 0
charts/nextcloud/1.3.6/templates/backup-postgres-config.yaml → charts/nextcloud/1.3.7/templates/backup-postgres-config.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/backup-postgres-hook.yaml → charts/nextcloud/1.3.7/templates/backup-postgres-hook.yaml


+ 1 - 0
charts/nextcloud/1.3.6/templates/deployment.yaml → 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") }}

+ 0 - 0
charts/nextcloud/1.3.6/templates/nginx-configmap.yaml → charts/nextcloud/1.3.7/templates/nginx-configmap.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/nginx-secret.yaml → charts/nextcloud/1.3.7/templates/nginx-secret.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/nuke-deployments-hook.yaml → charts/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/postgres-deployment.yaml → charts/nextcloud/1.3.7/templates/postgres-deployment.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/postgres-secret.yaml → charts/nextcloud/1.3.7/templates/postgres-secret.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/postgres-service.yaml → charts/nextcloud/1.3.7/templates/postgres-service.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/secrets.yaml → charts/nextcloud/1.3.7/templates/secrets.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/service.yaml → charts/nextcloud/1.3.7/templates/service.yaml


+ 0 - 0
charts/nextcloud/1.3.6/templates/serviceaccount.yaml → charts/nextcloud/1.3.7/templates/serviceaccount.yaml


+ 0 - 0
charts/nextcloud/1.3.6/test_values.yaml → charts/nextcloud/1.3.7/test_values.yaml


+ 0 - 0
test/nextcloud/1.3.6/.helmignore → test/nextcloud/1.3.7/.helmignore


+ 0 - 0
test/nextcloud/1.3.6/Chart.lock → test/nextcloud/1.3.7/Chart.lock


+ 1 - 1
test/nextcloud/1.3.6/Chart.yaml → 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

+ 0 - 0
test/nextcloud/1.3.6/README.md → test/nextcloud/1.3.7/README.md


+ 0 - 0
test/nextcloud/1.3.6/app-readme.md → test/nextcloud/1.3.7/app-readme.md


+ 0 - 0
test/nextcloud/1.3.6/charts/common-2105.0.0.tgz → test/nextcloud/1.3.7/charts/common-2105.0.0.tgz


+ 0 - 0
test/nextcloud/1.3.6/ix_values.yaml → test/nextcloud/1.3.7/ix_values.yaml


+ 0 - 0
test/nextcloud/1.3.6/migrations/migrate_from_1.1.0 → test/nextcloud/1.3.7/migrations/migrate_from_1.1.0


+ 0 - 0
test/nextcloud/1.3.6/questions.yaml → test/nextcloud/1.3.7/questions.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/NOTES.txt → test/nextcloud/1.3.7/templates/NOTES.txt


+ 0 - 0
test/nextcloud/1.3.6/templates/_nginx.tpl → test/nextcloud/1.3.7/templates/_nginx.tpl


+ 0 - 0
test/nextcloud/1.3.6/templates/_postgres.tpl → test/nextcloud/1.3.7/templates/_postgres.tpl


+ 0 - 0
test/nextcloud/1.3.6/templates/backup-postgres-config.yaml → test/nextcloud/1.3.7/templates/backup-postgres-config.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/backup-postgres-hook.yaml → test/nextcloud/1.3.7/templates/backup-postgres-hook.yaml


+ 1 - 0
test/nextcloud/1.3.6/templates/deployment.yaml → 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") }}

+ 0 - 0
test/nextcloud/1.3.6/templates/nginx-configmap.yaml → test/nextcloud/1.3.7/templates/nginx-configmap.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/nginx-secret.yaml → test/nextcloud/1.3.7/templates/nginx-secret.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/nuke-deployments-hook.yaml → test/nextcloud/1.3.7/templates/nuke-deployments-hook.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/postgres-deployment.yaml → test/nextcloud/1.3.7/templates/postgres-deployment.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/postgres-secret.yaml → test/nextcloud/1.3.7/templates/postgres-secret.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/postgres-service.yaml → test/nextcloud/1.3.7/templates/postgres-service.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/secrets.yaml → test/nextcloud/1.3.7/templates/secrets.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/service.yaml → test/nextcloud/1.3.7/templates/service.yaml


+ 0 - 0
test/nextcloud/1.3.6/templates/serviceaccount.yaml → test/nextcloud/1.3.7/templates/serviceaccount.yaml


+ 0 - 0
test/nextcloud/1.3.6/test_values.yaml → test/nextcloud/1.3.7/test_values.yaml