Răsfoiți Sursa

Publish new changes in catalog

sonicaj 1 an în urmă
părinte
comite
ba65a7dce3
100 a modificat fișierele cu 126 adăugiri și 93 ștergeri
  1. 0 0
      charts/netdata/2.0.8/.helmignore
  2. 0 0
      charts/netdata/2.0.8/Chart.lock
  3. 2 2
      charts/netdata/2.0.8/Chart.yaml
  4. 0 0
      charts/netdata/2.0.8/README.md
  5. 0 0
      charts/netdata/2.0.8/app-readme.md
  6. 0 0
      charts/netdata/2.0.8/charts/common-1.2.9.tgz
  7. 0 0
      charts/netdata/2.0.8/ci/basic-values.yaml
  8. 1 1
      charts/netdata/2.0.8/ix_values.yaml
  9. 0 0
      charts/netdata/2.0.8/metadata.yaml
  10. 0 0
      charts/netdata/2.0.8/migrations/migrate
  11. 0 0
      charts/netdata/2.0.8/questions.yaml
  12. 0 0
      charts/netdata/2.0.8/templates/NOTES.txt
  13. 0 0
      charts/netdata/2.0.8/templates/_migration.tpl
  14. 0 0
      charts/netdata/2.0.8/templates/_netdata.tpl
  15. 0 0
      charts/netdata/2.0.8/templates/_persistence.tpl
  16. 0 0
      charts/netdata/2.0.8/templates/_portal.tpl
  17. 0 0
      charts/netdata/2.0.8/templates/_rbac.tpl
  18. 0 0
      charts/netdata/2.0.8/templates/_service.tpl
  19. 0 0
      charts/netdata/2.0.8/templates/common.yaml
  20. 0 0
      charts/netdata/2.0.8/to_keep_versions.md
  21. 0 15
      charts/nextcloud/2.0.3/templates/_nextcloud-configs.tpl
  22. 0 12
      charts/nextcloud/2.0.3/templates/_portal.tpl
  23. 0 0
      charts/nextcloud/2.0.4/.helmignore
  24. 0 0
      charts/nextcloud/2.0.4/Chart.lock
  25. 1 1
      charts/nextcloud/2.0.4/Chart.yaml
  26. 0 0
      charts/nextcloud/2.0.4/README.md
  27. 0 0
      charts/nextcloud/2.0.4/app-readme.md
  28. 0 0
      charts/nextcloud/2.0.4/charts/common-1.2.9.tgz
  29. 0 0
      charts/nextcloud/2.0.4/ci/basic-values.yaml
  30. 0 0
      charts/nextcloud/2.0.4/ci/https-values.yaml
  31. 0 0
      charts/nextcloud/2.0.4/ci/no-cron.yaml
  32. 1 4
      charts/nextcloud/2.0.4/ci/nocmd-values.yaml
  33. 0 0
      charts/nextcloud/2.0.4/ci/onedata-values.yaml
  34. 4 0
      charts/nextcloud/2.0.4/ix_values.yaml
  35. 0 0
      charts/nextcloud/2.0.4/metadata.yaml
  36. 5 5
      charts/nextcloud/2.0.4/migrations/migrate
  37. 10 11
      charts/nextcloud/2.0.4/questions.yaml
  38. 0 0
      charts/nextcloud/2.0.4/templates/NOTES.txt
  39. 20 10
      charts/nextcloud/2.0.4/templates/_configuration.tpl
  40. 0 0
      charts/nextcloud/2.0.4/templates/_cron.tpl
  41. 0 0
      charts/nextcloud/2.0.4/templates/_migration.tpl
  42. 35 0
      charts/nextcloud/2.0.4/templates/_nextcloud-configs.tpl
  43. 0 0
      charts/nextcloud/2.0.4/templates/_nextcloud.tpl
  44. 4 23
      charts/nextcloud/2.0.4/templates/_nginx-configuration.tpl
  45. 0 0
      charts/nextcloud/2.0.4/templates/_nginx.tpl
  46. 10 0
      charts/nextcloud/2.0.4/templates/_persistence.tpl
  47. 24 0
      charts/nextcloud/2.0.4/templates/_portal.tpl
  48. 0 0
      charts/nextcloud/2.0.4/templates/_postgres.tpl
  49. 0 0
      charts/nextcloud/2.0.4/templates/_redis.tpl
  50. 0 0
      charts/nextcloud/2.0.4/templates/_service.tpl
  51. 0 0
      charts/nextcloud/2.0.4/templates/common.yaml
  52. 0 0
      charts/nextcloud/2.0.4/to_keep_versions.md
  53. 0 0
      charts/pihole/2.0.11/.helmignore
  54. 0 0
      charts/pihole/2.0.11/Chart.lock
  55. 2 2
      charts/pihole/2.0.11/Chart.yaml
  56. 0 0
      charts/pihole/2.0.11/README.md
  57. 0 0
      charts/pihole/2.0.11/app-readme.md
  58. 0 0
      charts/pihole/2.0.11/charts/common-1.2.9.tgz
  59. 0 0
      charts/pihole/2.0.11/ci/basic-values.yaml
  60. 0 0
      charts/pihole/2.0.11/ci/nodhcp-values.yaml
  61. 1 1
      charts/pihole/2.0.11/ix_values.yaml
  62. 0 0
      charts/pihole/2.0.11/metadata.yaml
  63. 0 0
      charts/pihole/2.0.11/migrations/migrate
  64. 0 0
      charts/pihole/2.0.11/questions.yaml
  65. 0 0
      charts/pihole/2.0.11/templates/NOTES.txt
  66. 0 0
      charts/pihole/2.0.11/templates/_migration.tpl
  67. 0 0
      charts/pihole/2.0.11/templates/_persistence.tpl
  68. 0 0
      charts/pihole/2.0.11/templates/_pihole.tpl
  69. 0 0
      charts/pihole/2.0.11/templates/_portal.tpl
  70. 0 0
      charts/pihole/2.0.11/templates/_service.tpl
  71. 0 0
      charts/pihole/2.0.11/templates/common.yaml
  72. 0 0
      charts/pihole/2.0.11/to_keep_versions.md
  73. 0 0
      charts/prometheus/1.1.15/Chart.lock
  74. 2 2
      charts/prometheus/1.1.15/Chart.yaml
  75. 0 0
      charts/prometheus/1.1.15/README.md
  76. 0 0
      charts/prometheus/1.1.15/app-readme.md
  77. 0 0
      charts/prometheus/1.1.15/charts/common-1.2.9.tgz
  78. 0 0
      charts/prometheus/1.1.15/ci/basic-values.yaml
  79. 1 1
      charts/prometheus/1.1.15/ix_values.yaml
  80. 0 0
      charts/prometheus/1.1.15/metadata.yaml
  81. 0 0
      charts/prometheus/1.1.15/migrations/migrate
  82. 0 0
      charts/prometheus/1.1.15/questions.yaml
  83. 0 0
      charts/prometheus/1.1.15/templates/NOTES.txt
  84. 0 0
      charts/prometheus/1.1.15/templates/_portal.tpl
  85. 0 0
      charts/prometheus/1.1.15/templates/_prometheus.tpl
  86. 0 0
      charts/prometheus/1.1.15/templates/common.yaml
  87. 0 0
      charts/syncthing/2.0.6/.helmignore
  88. 0 0
      charts/syncthing/2.0.6/Chart.lock
  89. 2 2
      charts/syncthing/2.0.6/Chart.yaml
  90. 0 0
      charts/syncthing/2.0.6/README.md
  91. 0 0
      charts/syncthing/2.0.6/app-readme.md
  92. 0 0
      charts/syncthing/2.0.6/charts/common-1.2.9.tgz
  93. 0 0
      charts/syncthing/2.0.6/ci/basic-values.yaml
  94. 0 0
      charts/syncthing/2.0.6/ci/host-values.yaml
  95. 1 1
      charts/syncthing/2.0.6/ix_values.yaml
  96. 0 0
      charts/syncthing/2.0.6/metadata.yaml
  97. 0 0
      charts/syncthing/2.0.6/migrations/migrate
  98. 0 0
      charts/syncthing/2.0.6/questions.yaml
  99. 0 0
      charts/syncthing/2.0.6/templates/NOTES.txt
  100. 0 0
      charts/syncthing/2.0.6/templates/_migration.tpl

+ 0 - 0
charts/netdata/2.0.7/.helmignore → charts/netdata/2.0.8/.helmignore


+ 0 - 0
charts/netdata/2.0.7/Chart.lock → charts/netdata/2.0.8/Chart.lock


+ 2 - 2
charts/netdata/2.0.7/Chart.yaml → charts/netdata/2.0.8/Chart.yaml

@@ -3,9 +3,9 @@ description: Real-time performance monitoring, done right!
 annotations:
 annotations:
   title: Netdata
   title: Netdata
 type: application
 type: application
-version: 2.0.7
+version: 2.0.8
 apiVersion: v2
 apiVersion: v2
-appVersion: v1.45.3
+appVersion: v1.45.4
 kubeVersion: '>=1.16.0-0'
 kubeVersion: '>=1.16.0-0'
 maintainers:
 maintainers:
   - name: truenas
   - name: truenas

+ 0 - 0
charts/netdata/2.0.7/README.md → charts/netdata/2.0.8/README.md


+ 0 - 0
charts/netdata/2.0.7/app-readme.md → charts/netdata/2.0.8/app-readme.md


+ 0 - 0
charts/netdata/2.0.7/charts/common-1.2.9.tgz → charts/netdata/2.0.8/charts/common-1.2.9.tgz


+ 0 - 0
charts/netdata/2.0.7/ci/basic-values.yaml → charts/netdata/2.0.8/ci/basic-values.yaml


+ 1 - 1
charts/netdata/2.0.7/ix_values.yaml → charts/netdata/2.0.8/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
 image:
   pullPolicy: IfNotPresent
   pullPolicy: IfNotPresent
   repository: netdata/netdata
   repository: netdata/netdata
-  tag: v1.45.3
+  tag: v1.45.4
 
 
 resources:
 resources:
   limits:
   limits:

+ 0 - 0
charts/netdata/2.0.7/metadata.yaml → charts/netdata/2.0.8/metadata.yaml


+ 0 - 0
charts/netdata/2.0.7/migrations/migrate → charts/netdata/2.0.8/migrations/migrate


+ 0 - 0
charts/netdata/2.0.7/questions.yaml → charts/netdata/2.0.8/questions.yaml


+ 0 - 0
charts/netdata/2.0.7/templates/NOTES.txt → charts/netdata/2.0.8/templates/NOTES.txt


+ 0 - 0
charts/netdata/2.0.7/templates/_migration.tpl → charts/netdata/2.0.8/templates/_migration.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/_netdata.tpl → charts/netdata/2.0.8/templates/_netdata.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/_persistence.tpl → charts/netdata/2.0.8/templates/_persistence.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/_portal.tpl → charts/netdata/2.0.8/templates/_portal.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/_rbac.tpl → charts/netdata/2.0.8/templates/_rbac.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/_service.tpl → charts/netdata/2.0.8/templates/_service.tpl


+ 0 - 0
charts/netdata/2.0.7/templates/common.yaml → charts/netdata/2.0.8/templates/common.yaml


+ 0 - 0
charts/netdata/2.0.7/to_keep_versions.md → charts/netdata/2.0.8/to_keep_versions.md


+ 0 - 15
charts/nextcloud/2.0.3/templates/_nextcloud-configs.tpl

@@ -1,15 +0,0 @@
-{{- define "nextcloud.configs" -}}
-{{ $bytesGB := 1073741824 }}
-configmap:
-  nextcloud-config:
-    enabled: true
-    data:
-      opcache.ini: |
-        opcache.memory_consumption={{ .Values.ncConfig.opCacheMemoryConsumption }}
-
-      php.ini: |
-        max_execution_time={{ .Values.ncConfig.maxExecutionTime }}
-
-      limitrequestbody.conf: |
-        LimitRequestBody {{ mul .Values.ncConfig.maxUploadLimit $bytesGB }}
-{{- end -}}

+ 0 - 12
charts/nextcloud/2.0.3/templates/_portal.tpl

@@ -1,12 +0,0 @@
-{{- define "nextcloud.portal" -}}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal
-data:
-  port: {{ .Values.ncNetwork.webPort | quote }}
-  path: "/"
-  protocol: "http"
-  host: $node_ip
-{{- end -}}

+ 0 - 0
charts/nextcloud/2.0.3/.helmignore → charts/nextcloud/2.0.4/.helmignore


+ 0 - 0
charts/nextcloud/2.0.3/Chart.lock → charts/nextcloud/2.0.4/Chart.lock


+ 1 - 1
charts/nextcloud/2.0.3/Chart.yaml → charts/nextcloud/2.0.4/Chart.yaml

@@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow
 annotations:
 annotations:
   title: Nextcloud
   title: Nextcloud
 type: application
 type: application
-version: 2.0.3
+version: 2.0.4
 apiVersion: v2
 apiVersion: v2
 appVersion: 29.0.0
 appVersion: 29.0.0
 kubeVersion: '>=1.16.0-0'
 kubeVersion: '>=1.16.0-0'

+ 0 - 0
charts/nextcloud/2.0.3/README.md → charts/nextcloud/2.0.4/README.md


+ 0 - 0
charts/nextcloud/2.0.3/app-readme.md → charts/nextcloud/2.0.4/app-readme.md


+ 0 - 0
charts/nextcloud/2.0.3/charts/common-1.2.9.tgz → charts/nextcloud/2.0.4/charts/common-1.2.9.tgz


+ 0 - 0
charts/nextcloud/2.0.3/ci/basic-values.yaml → charts/nextcloud/2.0.4/ci/basic-values.yaml


+ 0 - 0
charts/nextcloud/2.0.3/ci/https-values.yaml → charts/nextcloud/2.0.4/ci/https-values.yaml


+ 0 - 0
charts/nextcloud/2.0.3/ci/no-cron.yaml → charts/nextcloud/2.0.4/ci/no-cron.yaml


+ 1 - 4
charts/nextcloud/2.0.3/ci/nocmd-values.yaml → charts/nextcloud/2.0.4/ci/nocmd-values.yaml

@@ -9,10 +9,7 @@ ncConfig:
 
 
 ncNetwork:
 ncNetwork:
   webPort: 30001
   webPort: 30001
-  nginx:
-    proxyTimeouts: 120
-    useDifferentAccessPort: false
-    externalAccessPort: 443
+  nginx: {}
 
 
 ncStorage:
 ncStorage:
   pgData:
   pgData:

+ 0 - 0
charts/nextcloud/2.0.3/ci/onedata-values.yaml → charts/nextcloud/2.0.4/ci/onedata-values.yaml


+ 4 - 0
charts/nextcloud/2.0.3/ix_values.yaml → charts/nextcloud/2.0.4/ix_values.yaml

@@ -87,3 +87,7 @@ notes:
     {{- $_ := unset .Values "ncDbName" }}
     {{- $_ := unset .Values "ncDbName" }}
     {{- $_ := unset .Values "ncDbPass" }}
     {{- $_ := unset .Values "ncDbPass" }}
     {{- $_ := unset .Values "ncDbHost" }}
     {{- $_ := unset .Values "ncDbHost" }}
+
+    Note: Nextcloud will create an additional new user and password for the admin user
+    on first startup. You can find those credentials in the `/var/www/html/config/config.php` file
+    inside the container.

+ 0 - 0
charts/nextcloud/2.0.3/metadata.yaml → charts/nextcloud/2.0.4/metadata.yaml


+ 5 - 5
charts/nextcloud/2.0.3/migrations/migrate → charts/nextcloud/2.0.4/migrations/migrate

@@ -33,7 +33,7 @@ def migrate_common_lib(values):
                 'proxyTimeouts': values.get('nginxConfig', {}).get('proxy_timeouts', 60),
                 'proxyTimeouts': values.get('nginxConfig', {}).get('proxy_timeouts', 60),
                 'useDifferentAccessPort': values.get('nginxConfig', {}).get('useDifferentAccessPort', False),
                 'useDifferentAccessPort': values.get('nginxConfig', {}).get('useDifferentAccessPort', False),
                 'externalAccessPort': values.get('nginxConfig', {}).get('externalAccessPort', 443)
                 'externalAccessPort': values.get('nginxConfig', {}).get('externalAccessPort', 443)
-            }
+            } if values['certificate'] else {}
         },
         },
         # Migrate Resources
         # Migrate Resources
         'resources': {
         'resources': {
@@ -70,7 +70,6 @@ def migrate_common_lib(values):
         },
         },
         # Migrate Storage
         # Migrate Storage
         'ncStorage': {
         'ncStorage': {
-            'shouldShowStorageToggle': True,
             'isDataInTheSameVolume': True,
             'isDataInTheSameVolume': True,
             'pgData': migrate_volume(values['postgresAppVolumeMounts']['postgres-data']),
             'pgData': migrate_volume(values['postgresAppVolumeMounts']['postgres-data']),
             'pgBackup': migrate_volume(values['postgresAppVolumeMounts']['postgres-backup']),
             'pgBackup': migrate_volume(values['postgresAppVolumeMounts']['postgres-backup']),
@@ -93,16 +92,17 @@ def migrate_common_lib(values):
     return values
     return values
 
 
 def migrate(values):
 def migrate(values):
-    if 'isDataInTheSameVolume' in values.keys() or 'shouldShowStorageToggle' in values.keys():
+    if 'isDataInTheSameVolume' in values.keys():
         values['ncStorage']['isDataInTheSameVolume'] = values.pop('isDataInTheSameVolume', True)
         values['ncStorage']['isDataInTheSameVolume'] = values.pop('isDataInTheSameVolume', True)
-        values['ncStorage']['shouldShowStorageToggle'] = values.pop('shouldShowStorageToggle', True)
         return values
         return values
 
 
     # If this missing, we have already migrated
     # If this missing, we have already migrated
     if not 'appVolumeMounts' in values.keys():
     if not 'appVolumeMounts' in values.keys():
+        if 'certificateID' in values['ncNetwork']:
+            if not values['ncNetwork']['certificateID']:
+                values['ncNetwork']['nginx'] = {}
         # If 'shouldFixMigration' missing, we should fix migration and then add the key
         # If 'shouldFixMigration' missing, we should fix migration and then add the key
         if not 'migrationFixed' in values['ncStorage'].keys():
         if not 'migrationFixed' in values['ncStorage'].keys():
-            values['ncStorage']['shouldShowStorageToggle'] = True
             values['ncStorage']['isDataInTheSameVolume'] = True
             values['ncStorage']['isDataInTheSameVolume'] = True
             values['ncStorage']['migrationFixed'] = True
             values['ncStorage']['migrationFixed'] = True
         return values
         return values

+ 10 - 11
charts/nextcloud/2.0.3/questions.yaml → charts/nextcloud/2.0.4/questions.yaml

@@ -44,7 +44,12 @@ questions:
             required: true
             required: true
         - variable: host
         - variable: host
           label: Host
           label: Host
-          description: Nextcloud host to create application URLs
+          description: |
+            Nextcloud host to create application URLs</br>
+            Examples: </br>
+            cloud.domain.com:30001</br>
+            cloud.domain.com (if you use port 443 externally)</br>
+            192.168.1.100:9001 (replace ip and port with your own)</br>
           schema:
           schema:
             type: string
             type: string
             $ref:
             $ref:
@@ -194,7 +199,7 @@ questions:
           description: The port for the Nextcloud Web UI.
           description: The port for the Nextcloud Web UI.
           schema:
           schema:
             type: int
             type: int
-            default: 20810
+            default: 9001
             min: 9000
             min: 9000
             max: 65535
             max: 65535
             required: true
             required: true
@@ -248,12 +253,6 @@ questions:
     schema:
     schema:
       type: dict
       type: dict
       attrs:
       attrs:
-        - variable: shouldShowStorageToggle
-          label: ""
-          schema:
-            type: boolean
-            default: false
-            hidden: true
         # Dummy variable so we can skip "fixing" migration on new installations
         # Dummy variable so we can skip "fixing" migration on new installations
         - variable: migrationFixed
         - variable: migrationFixed
           label: ""
           label: ""
@@ -264,6 +263,7 @@ questions:
         - variable: isDataInTheSameVolume
         - variable: isDataInTheSameVolume
           label: "Pre v2 Storage Structure (See the tooltip for more information)"
           label: "Pre v2 Storage Structure (See the tooltip for more information)"
           description: |
           description: |
+            Do NOT check this, if this is a new installation.</br>
             If this is checked, means that this is an installation coming from a previous version (v1.x.x).<br/>
             If this is checked, means that this is an installation coming from a previous version (v1.x.x).<br/>
             In order to have backwards compatibility, the older storage structure was kept for this installation.<br/>
             In order to have backwards compatibility, the older storage structure was kept for this installation.<br/>
             If you want to utilize the new storage structure, move 'data' in a separate directory or dataset.
             If you want to utilize the new storage structure, move 'data' in a separate directory or dataset.
@@ -272,10 +272,9 @@ questions:
             You will NOT likely want to change that if your setup uses ixVolume as storage.
             You will NOT likely want to change that if your setup uses ixVolume as storage.
           schema:
           schema:
             type: boolean
             type: boolean
-            show_if: [["shouldShowStorageToggle", "=", true]]
             default: false
             default: false
         - variable: html
         - variable: html
-          label: Nextcloud HTML Storage
+          label: Nextcloud AppData Storage (HTML, Custom Themes, Apps, etc.)
           description: The path to store Nextcloud HTML and AppData.
           description: The path to store Nextcloud HTML and AppData.
           schema:
           schema:
             type: dict
             type: dict
@@ -774,7 +773,7 @@ questions:
                 schema:
                 schema:
                   type: string
                   type: string
                   max_length: 12
                   max_length: 12
-                  valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$'
+                  valid_chars: "^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$"
                   valid_chars_error: |
                   valid_chars_error: |
                     Valid Memory limit formats are</br>
                     Valid Memory limit formats are</br>
                     - Suffixed with E/P/T/G/M/K - eg. 1G</br>
                     - Suffixed with E/P/T/G/M/K - eg. 1G</br>

+ 0 - 0
charts/nextcloud/2.0.3/templates/NOTES.txt → charts/nextcloud/2.0.4/templates/NOTES.txt


+ 20 - 10
charts/nextcloud/2.0.3/templates/_configuration.tpl → charts/nextcloud/2.0.4/templates/_configuration.tpl

@@ -27,10 +27,10 @@
 
 
   {{/* Temporary set dynamic db details on values,
   {{/* Temporary set dynamic db details on values,
   so we can print them on the notes */}}
   so we can print them on the notes */}}
-  {{- $_ := set .Values "ncDbPass" $dbPass -}}
-  {{- $_ := set .Values "ncDbHost" $dbHost -}}
-  {{- $_ := set .Values "ncDbName" $dbName -}}
-  {{- $_ := set .Values "ncDbUser" $dbUser -}}
+  {{- $_ := set .Values "ncDbPass" $dbPass | quote -}}
+  {{- $_ := set .Values "ncDbHost" $dbHost | quote -}}
+  {{- $_ := set .Values "ncDbName" $dbName | quote -}}
+  {{- $_ := set .Values "ncDbUser" $dbUser | quote -}}
 
 
   {{- $dbURL := (printf "postgres://%s:%s@%s:5432/%s?sslmode=disable" $dbUser $dbPass $dbHost $dbName) }}
   {{- $dbURL := (printf "postgres://%s:%s@%s:5432/%s?sslmode=disable" $dbUser $dbPass $dbHost $dbName) }}
 secret:
 secret:
@@ -63,7 +63,14 @@ secret:
       NEXTCLOUD_DATA_DIR: {{ .Values.ncConfig.dataDir }}
       NEXTCLOUD_DATA_DIR: {{ .Values.ncConfig.dataDir }}
       PHP_UPLOAD_LIMIT: {{ printf "%vG" .Values.ncConfig.maxUploadLimit | default 3 }}
       PHP_UPLOAD_LIMIT: {{ printf "%vG" .Values.ncConfig.maxUploadLimit | default 3 }}
       PHP_MEMORY_LIMIT: {{ printf "%vM" .Values.ncConfig.phpMemoryLimit | default 512 }}
       PHP_MEMORY_LIMIT: {{ printf "%vM" .Values.ncConfig.phpMemoryLimit | default 512 }}
-      NEXTCLOUD_TRUSTED_DOMAINS: {{ list .Values.ncConfig.host "127.0.0.1" "localhost" $fullname (printf "%v-*" $fullname) | mustUniq | join " " | quote }}
+      {{- $host := "127.0.0.1" -}}
+      {{- if .Values.ncConfig.host -}}
+        {{- $host = printf "%v:%v" .Values.ncConfig.host .Values.ncNetwork.webPort -}}
+        {{- if contains ":" $host  -}} {{/* Make sure it always contains a port https://ixsystems.atlassian.net/browse/TNCHARTS-1016 */}}
+          {{- $host = .Values.ncConfig.host -}}
+        {{- end -}}
+      {{- end }}
+      NEXTCLOUD_TRUSTED_DOMAINS: {{ list $host "127.0.0.1" "localhost" (printf "%v-*" $fullname) $fullname | mustUniq | join " " | quote }}
       NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
       NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
       NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
       NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
     {{- if .Values.ncNetwork.certificateID }}
     {{- if .Values.ncNetwork.certificateID }}
@@ -75,11 +82,14 @@ secret:
       {{- end }}
       {{- end }}
       APACHE_DISABLE_REWRITE_IP: "1"
       APACHE_DISABLE_REWRITE_IP: "1"
       OVERWRITEPROTOCOL: "https"
       OVERWRITEPROTOCOL: "https"
-      TRUSTED_PROXIES: {{ list  $svcCidr $clusterCidr "127.0.0.1" | mustUniq | join "," | quote }}
-      {{- if and .Values.ncConfig.host .Values.ncNetwork.webPort }}
-        {{- $overwritehost := .Values.ncConfig.host -}}
-        {{- if .Values.ncNetwork.nginx.useDifferentAccessPort }}
-          {{ $overwritehost = (printf "%v:%v" .Values.ncConfig.host .Values.ncNetwork.webPort) }}
+      TRUSTED_PROXIES: {{ list $svcCidr $clusterCidr "127.0.0.1" | mustUniq | join " " | quote }}
+      {{- if .Values.ncConfig.host }}
+        {{- $overwritehost := printf "%v:%v" .Values.ncConfig.host .Values.ncNetwork.webPort -}}
+        {{- if .Values.ncNetwork.nginx.useDifferentAccessPort -}}
+          {{ $overwritehost = printf "%v:%v" .Values.ncConfig.host .Values.ncNetwork.nginx.externalAccessPort -}}
+          {{- if contains ":" .Values.ncConfig.host -}}
+            {{- $overwritehost = .Values.ncConfig.host -}}
+          {{- end -}}
         {{- end }}
         {{- end }}
       OVERWRITEHOST: {{ $overwritehost }}
       OVERWRITEHOST: {{ $overwritehost }}
       {{- end }}
       {{- end }}

+ 0 - 0
charts/nextcloud/2.0.3/templates/_cron.tpl → charts/nextcloud/2.0.4/templates/_cron.tpl


+ 0 - 0
charts/nextcloud/2.0.3/templates/_migration.tpl → charts/nextcloud/2.0.4/templates/_migration.tpl


+ 35 - 0
charts/nextcloud/2.0.4/templates/_nextcloud-configs.tpl

@@ -0,0 +1,35 @@
+{{- define "nextcloud.configs" -}}
+{{ $bytesGB := 1073741824 }}
+configmap:
+  nextcloud-config:
+    enabled: true
+    data:
+      opcache.ini: |
+        opcache.memory_consumption={{ .Values.ncConfig.opCacheMemoryConsumption }}
+
+      php.ini: |
+        max_execution_time={{ .Values.ncConfig.maxExecutionTime }}
+
+      limitrequestbody.conf: |
+        LimitRequestBody {{ mul .Values.ncConfig.maxUploadLimit $bytesGB }}
+
+      occ: |
+        #!/bin/bash
+        uid="$(id -u)"
+        gid="$(id -g)"
+        if [ "$uid" = '0' ]; then
+          user='www-data'
+          group='www-data'
+        else
+          user="$uid"
+          group="$gid"
+        fi
+        run_as() {
+          if [ "$(id -u)" = 0 ]; then
+            su -p "$user" -s /bin/bash -c 'php /var/www/html/occ "$@"' - "$@"
+          else
+            /bin/bash -c 'php /var/www/html/occ "$@"' - "$@"
+          fi
+        }
+        run_as "$@"
+{{- end -}}

+ 0 - 0
charts/nextcloud/2.0.3/templates/_nextcloud.tpl → charts/nextcloud/2.0.4/templates/_nextcloud.tpl


+ 4 - 23
charts/nextcloud/2.0.3/templates/_nginx-configuration.tpl → charts/nextcloud/2.0.4/templates/_nginx-configuration.tpl

@@ -10,7 +10,7 @@ scaleCertificate:
   {{ $timeout := 60 }}
   {{ $timeout := 60 }}
   {{ $size := .Values.ncConfig.maxUploadLimit | default 3 }}
   {{ $size := .Values.ncConfig.maxUploadLimit | default 3 }}
   {{ $useDiffAccessPort := false }}
   {{ $useDiffAccessPort := false }}
-  {{ $externalAccessPort := "" }}
+  {{ $externalAccessPort := ":$server_port" }}
   {{/* Safely access key as it is conditionaly shown */}}
   {{/* Safely access key as it is conditionaly shown */}}
   {{ if hasKey .Values.ncNetwork "nginx" }}
   {{ if hasKey .Values.ncNetwork "nginx" }}
     {{ $useDiffAccessPort = .Values.ncNetwork.nginx.useDifferentAccessPort }}
     {{ $useDiffAccessPort = .Values.ncNetwork.nginx.useDifferentAccessPort }}
@@ -29,22 +29,15 @@ configmap:
         events {}
         events {}
         http {
         http {
           server {
           server {
-            # redirects all http requests to https requests
-            listen 8000 default_server;
-            listen [::]:8000 default_server;
-            return 301 https://$host$request_uri;
-          }
-
-          server {
-            server_name localhost;
-
             listen {{ .Values.ncNetwork.webPort }} ssl http2;
             listen {{ .Values.ncNetwork.webPort }} ssl http2;
             listen [::]:{{ .Values.ncNetwork.webPort }} ssl http2;
             listen [::]:{{ .Values.ncNetwork.webPort }} ssl http2;
 
 
+            # Redirect HTTP to HTTPS
+            error_page 497 301 =307 https://$host{{ $externalAccessPort }}$request_uri;
+
             ssl_certificate '/etc/nginx-certs/public.crt';
             ssl_certificate '/etc/nginx-certs/public.crt';
             ssl_certificate_key '/etc/nginx-certs/private.key';
             ssl_certificate_key '/etc/nginx-certs/private.key';
 
 
-            # maximum 3GB Upload File; change to fit your needs
             client_max_body_size {{ $size }}G;
             client_max_body_size {{ $size }}G;
 
 
             add_header Strict-Transport-Security "max-age=15552000; includeSubDomains; preload" always;
             add_header Strict-Transport-Security "max-age=15552000; includeSubDomains; preload" always;
@@ -56,19 +49,11 @@ configmap:
             }
             }
 
 
             location = /.well-known/carddav {
             location = /.well-known/carddav {
-              {{ if $useDiffAccessPort }}
               return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav;
               return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav;
-              {{ else }}
-              return 301 $scheme://$host:$server_port/remote.php/dav;
-              {{ end }}
             }
             }
 
 
             location = /.well-known/caldav {
             location = /.well-known/caldav {
-              {{ if $useDiffAccessPort }}
               return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav;
               return 301 $scheme://$host{{ $externalAccessPort }}/remote.php/dav;
-              {{ else }}
-              return 301 $scheme://$host:$server_port/remote.php/dav;
-              {{ end }}
             }
             }
 
 
             location / {
             location / {
@@ -85,11 +70,7 @@ configmap:
               proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
               proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
               proxy_set_header X-Forwarded-Proto https;
               proxy_set_header X-Forwarded-Proto https;
               proxy_set_header X-Forwarded-Host  $host;
               proxy_set_header X-Forwarded-Host  $host;
-              {{ if $useDiffAccessPort }}
               proxy_set_header X-Forwarded-Port  {{ $externalAccessPort | default "443" | trimPrefix ":" }};
               proxy_set_header X-Forwarded-Port  {{ $externalAccessPort | default "443" | trimPrefix ":" }};
-              {{ else }}
-              proxy_set_header X-Forwarded-Port  $server_port;
-              {{ end }}
 
 
               # Proxy timeouts
               # Proxy timeouts
               proxy_connect_timeout              {{ $timeout }}s;
               proxy_connect_timeout              {{ $timeout }}s;

+ 0 - 0
charts/nextcloud/2.0.3/templates/_nginx.tpl → charts/nextcloud/2.0.4/templates/_nginx.tpl


+ 10 - 0
charts/nextcloud/2.0.3/templates/_persistence.tpl → charts/nextcloud/2.0.4/templates/_persistence.tpl

@@ -108,6 +108,16 @@ persistence:
           # https://github.com/nextcloud/docker/issues/1796
           # https://github.com/nextcloud/docker/issues/1796
           mountPath: /etc/apache2/conf-enabled/limitrequestbody.conf
           mountPath: /etc/apache2/conf-enabled/limitrequestbody.conf
           subPath: limitrequestbody.conf
           subPath: limitrequestbody.conf
+  nc-occ:
+    enabled: true
+    type: configmap
+    objectName: nextcloud-config
+    defaultMode: "0755"
+    targetSelector:
+      nextcloud:
+        nextcloud:
+          mountPath: /usr/bin/occ
+          subPath: occ
   tmp:
   tmp:
     enabled: true
     enabled: true
     type: emptyDir
     type: emptyDir

+ 24 - 0
charts/nextcloud/2.0.4/templates/_portal.tpl

@@ -0,0 +1,24 @@
+{{- define "nextcloud.portal" -}}
+{{- $protocol := "http" -}}
+{{- if .Values.ncNetwork.certificateID -}}
+  {{- $protocol = "https" -}}
+{{- end -}}
+{{- $host := "$node_ip" -}}
+{{- if .Values.ncConfig.host -}}
+  {{- $host = .Values.ncConfig.host -}}
+{{- end -}}
+{{- $port := .Values.ncNetwork.webPort -}}
+{{- if .Values.ncNetwork.nginx.useDifferentAccessPort -}}
+  {{- $port = .Values.ncNetwork.nginx.externalAccessPort -}}
+{{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: portal
+data:
+  port: {{ $port | quote }}
+  path: "/"
+  protocol: {{ $protocol }}
+  host: {{ $host | quote }}
+{{- end -}}

+ 0 - 0
charts/nextcloud/2.0.3/templates/_postgres.tpl → charts/nextcloud/2.0.4/templates/_postgres.tpl


+ 0 - 0
charts/nextcloud/2.0.3/templates/_redis.tpl → charts/nextcloud/2.0.4/templates/_redis.tpl


+ 0 - 0
charts/nextcloud/2.0.3/templates/_service.tpl → charts/nextcloud/2.0.4/templates/_service.tpl


+ 0 - 0
charts/nextcloud/2.0.3/templates/common.yaml → charts/nextcloud/2.0.4/templates/common.yaml


+ 0 - 0
charts/nextcloud/2.0.3/to_keep_versions.md → charts/nextcloud/2.0.4/to_keep_versions.md


+ 0 - 0
charts/pihole/2.0.10/.helmignore → charts/pihole/2.0.11/.helmignore


+ 0 - 0
charts/pihole/2.0.10/Chart.lock → charts/pihole/2.0.11/Chart.lock


+ 2 - 2
charts/pihole/2.0.10/Chart.yaml → charts/pihole/2.0.11/Chart.yaml

@@ -3,9 +3,9 @@ description: DNS and Ad-filtering for your network.
 annotations:
 annotations:
   title: Pi-hole
   title: Pi-hole
 type: application
 type: application
-version: 2.0.10
+version: 2.0.11
 apiVersion: v2
 apiVersion: v2
-appVersion: 2024.03.2
+appVersion: 2024.05.0
 kubeVersion: '>=1.16.0-0'
 kubeVersion: '>=1.16.0-0'
 maintainers:
 maintainers:
   - name: truenas
   - name: truenas

+ 0 - 0
charts/pihole/2.0.10/README.md → charts/pihole/2.0.11/README.md


+ 0 - 0
charts/pihole/2.0.10/app-readme.md → charts/pihole/2.0.11/app-readme.md


+ 0 - 0
charts/pihole/2.0.10/charts/common-1.2.9.tgz → charts/pihole/2.0.11/charts/common-1.2.9.tgz


+ 0 - 0
charts/pihole/2.0.10/ci/basic-values.yaml → charts/pihole/2.0.11/ci/basic-values.yaml


+ 0 - 0
charts/pihole/2.0.10/ci/nodhcp-values.yaml → charts/pihole/2.0.11/ci/nodhcp-values.yaml


+ 1 - 1
charts/pihole/2.0.10/ix_values.yaml → charts/pihole/2.0.11/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
 image:
   pullPolicy: IfNotPresent
   pullPolicy: IfNotPresent
   repository: pihole/pihole
   repository: pihole/pihole
-  tag: 2024.03.2
+  tag: 2024.05.0
 
 
 resources:
 resources:
   limits:
   limits:

+ 0 - 0
charts/pihole/2.0.10/metadata.yaml → charts/pihole/2.0.11/metadata.yaml


+ 0 - 0
charts/pihole/2.0.10/migrations/migrate → charts/pihole/2.0.11/migrations/migrate


+ 0 - 0
charts/pihole/2.0.10/questions.yaml → charts/pihole/2.0.11/questions.yaml


+ 0 - 0
charts/pihole/2.0.10/templates/NOTES.txt → charts/pihole/2.0.11/templates/NOTES.txt


+ 0 - 0
charts/pihole/2.0.10/templates/_migration.tpl → charts/pihole/2.0.11/templates/_migration.tpl


+ 0 - 0
charts/pihole/2.0.10/templates/_persistence.tpl → charts/pihole/2.0.11/templates/_persistence.tpl


+ 0 - 0
charts/pihole/2.0.10/templates/_pihole.tpl → charts/pihole/2.0.11/templates/_pihole.tpl


+ 0 - 0
charts/pihole/2.0.10/templates/_portal.tpl → charts/pihole/2.0.11/templates/_portal.tpl


+ 0 - 0
charts/pihole/2.0.10/templates/_service.tpl → charts/pihole/2.0.11/templates/_service.tpl


+ 0 - 0
charts/pihole/2.0.10/templates/common.yaml → charts/pihole/2.0.11/templates/common.yaml


+ 0 - 0
charts/pihole/2.0.10/to_keep_versions.md → charts/pihole/2.0.11/to_keep_versions.md


+ 0 - 0
charts/prometheus/1.1.14/Chart.lock → charts/prometheus/1.1.15/Chart.lock


+ 2 - 2
charts/prometheus/1.1.14/Chart.yaml → charts/prometheus/1.1.15/Chart.yaml

@@ -3,9 +3,9 @@ description: The Prometheus monitoring system and time series database.
 annotations:
 annotations:
   title: Prometheus
   title: Prometheus
 type: application
 type: application
-version: 1.1.14
+version: 1.1.15
 apiVersion: v2
 apiVersion: v2
-appVersion: v2.51.2
+appVersion: v2.52.0
 kubeVersion: '>=1.16.0-0'
 kubeVersion: '>=1.16.0-0'
 maintainers:
 maintainers:
   - name: truenas
   - name: truenas

+ 0 - 0
charts/prometheus/1.1.14/README.md → charts/prometheus/1.1.15/README.md


+ 0 - 0
charts/prometheus/1.1.14/app-readme.md → charts/prometheus/1.1.15/app-readme.md


+ 0 - 0
charts/prometheus/1.1.14/charts/common-1.2.9.tgz → charts/prometheus/1.1.15/charts/common-1.2.9.tgz


+ 0 - 0
charts/prometheus/1.1.14/ci/basic-values.yaml → charts/prometheus/1.1.15/ci/basic-values.yaml


+ 1 - 1
charts/prometheus/1.1.14/ix_values.yaml → charts/prometheus/1.1.15/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
 image:
   repository: prom/prometheus
   repository: prom/prometheus
   pullPolicy: IfNotPresent
   pullPolicy: IfNotPresent
-  tag: v2.51.2
+  tag: v2.52.0
 
 
 resources:
 resources:
   limits:
   limits:

+ 0 - 0
charts/prometheus/1.1.14/metadata.yaml → charts/prometheus/1.1.15/metadata.yaml


+ 0 - 0
charts/prometheus/1.1.14/migrations/migrate → charts/prometheus/1.1.15/migrations/migrate


+ 0 - 0
charts/prometheus/1.1.14/questions.yaml → charts/prometheus/1.1.15/questions.yaml


+ 0 - 0
charts/prometheus/1.1.14/templates/NOTES.txt → charts/prometheus/1.1.15/templates/NOTES.txt


+ 0 - 0
charts/prometheus/1.1.14/templates/_portal.tpl → charts/prometheus/1.1.15/templates/_portal.tpl


+ 0 - 0
charts/prometheus/1.1.14/templates/_prometheus.tpl → charts/prometheus/1.1.15/templates/_prometheus.tpl


+ 0 - 0
charts/prometheus/1.1.14/templates/common.yaml → charts/prometheus/1.1.15/templates/common.yaml


+ 0 - 0
charts/syncthing/2.0.5/.helmignore → charts/syncthing/2.0.6/.helmignore


+ 0 - 0
charts/syncthing/2.0.5/Chart.lock → charts/syncthing/2.0.6/Chart.lock


+ 2 - 2
charts/syncthing/2.0.5/Chart.yaml → charts/syncthing/2.0.6/Chart.yaml

@@ -3,9 +3,9 @@ description: Syncthing is a continuous file synchronization program.
 annotations:
 annotations:
   title: Syncthing
   title: Syncthing
 type: application
 type: application
-version: 2.0.5
+version: 2.0.6
 apiVersion: v2
 apiVersion: v2
-appVersion: 1.27.6
+appVersion: 1.27.7
 kubeVersion: '>=1.16.0-0'
 kubeVersion: '>=1.16.0-0'
 maintainers:
 maintainers:
   - name: truenas
   - name: truenas

+ 0 - 0
charts/syncthing/2.0.5/README.md → charts/syncthing/2.0.6/README.md


+ 0 - 0
charts/syncthing/2.0.5/app-readme.md → charts/syncthing/2.0.6/app-readme.md


+ 0 - 0
charts/syncthing/2.0.5/charts/common-1.2.9.tgz → charts/syncthing/2.0.6/charts/common-1.2.9.tgz


+ 0 - 0
charts/syncthing/2.0.5/ci/basic-values.yaml → charts/syncthing/2.0.6/ci/basic-values.yaml


+ 0 - 0
charts/syncthing/2.0.5/ci/host-values.yaml → charts/syncthing/2.0.6/ci/host-values.yaml


+ 1 - 1
charts/syncthing/2.0.5/ix_values.yaml → charts/syncthing/2.0.6/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
 image:
   pullPolicy: IfNotPresent
   pullPolicy: IfNotPresent
   repository: syncthing/syncthing
   repository: syncthing/syncthing
-  tag: 1.27.6
+  tag: 1.27.7
 
 
 resources:
 resources:
   limits:
   limits:

+ 0 - 0
charts/syncthing/2.0.5/metadata.yaml → charts/syncthing/2.0.6/metadata.yaml


+ 0 - 0
charts/syncthing/2.0.5/migrations/migrate → charts/syncthing/2.0.6/migrations/migrate


+ 0 - 0
charts/syncthing/2.0.5/questions.yaml → charts/syncthing/2.0.6/questions.yaml


+ 0 - 0
charts/syncthing/2.0.5/templates/NOTES.txt → charts/syncthing/2.0.6/templates/NOTES.txt


+ 0 - 0
charts/syncthing/2.0.5/templates/_migration.tpl → charts/syncthing/2.0.6/templates/_migration.tpl


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff