nginx conf

library/ix-dev/charts/nextcloud/ci/basic-values.yaml

@@ -8,14 +8,14 @@ ncConfig:
     - smbclient
   maxUploadLimit: 3
   phpMemoryLimit: 512
+
+ncNetwork:
+  webPort: 30001
   nginx:
     proxyTimeouts: 120
     useDifferentAccessPort: false
     externalAccessPort: 80
 
-ncNetwork:
-  webPort: 30001
-
 ncStorage:
   pgData:
     type: pvc

library/ix-dev/charts/nextcloud/ci/https-values.yaml

@@ -8,14 +8,14 @@ ncConfig:
     - smbclient
   maxUploadLimit: 3
   phpMemoryLimit: 512
-  nginx:
-    proxyTimeouts: 120
-    useDifferentAccessPort: false
-    externalAccessPort: 80
 
 ncNetwork:
   webPort: 30001
   certificateID: 1
+  nginx:
+    proxyTimeouts: 120
+    useDifferentAccessPort: false
+    externalAccessPort: 80
 
 ncStorage:
   pgData:

library/ix-dev/charts/nextcloud/ci/nocmd-values.yaml

@@ -6,14 +6,14 @@ ncConfig:
   commands: []
   maxUploadLimit: 3
   phpMemoryLimit: 512
+
+ncNetwork:
+  webPort: 30001
   nginx:
     proxyTimeouts: 120
     useDifferentAccessPort: false
     externalAccessPort: 80
 
-ncNetwork:
-  webPort: 30001
-
 ncStorage:
   pgData:
     type: pvc

library/ix-dev/charts/nextcloud/questions.yaml

@@ -164,8 +164,43 @@ questions:
             "null": true
             $ref:
               - "definitions/certificate"
+        - variable: nginx
+          label: Nginx Configuration
+          schema:
+            type: dict
+            show_if: [["certificateID", "!=", null]]
+            attrs:
+              - variable: proxyTimeouts
+                label: Proxy timeouts (Seconds)
+                description: |
+                  Applies the timeout to the following settings:</br>
+                  - proxy_connect_timeout</br>
+                  - proxy_send_timeout</br>
+                  - proxy_read_timeout</br>
+                schema:
+                  type: int
+                  min: 30
+                  default: 60
+                  required: true
+              - variable: useDifferentAccessPort
+                label: Use different port for URL rewrites
+                description: |
+                  If enabled, the URL rewrite will use [Access Port] defined below instead of the [Node Port].</br>
+                  Note that Nextcloud will still listen on the [Node Port]. (Default 9001)
+                schema:
+                  type: boolean
+                  default: false
+              - variable: externalAccessPort
+                label: External Access Port
+                schema:
+                  type: int
+                  show_if: [["useDifferentAccessPort", "=", true]]
+                  min: 443
+                  max: 65535
+                  default: 443
+                  required: true
 
-  - variable: haStorage
+  - variable: ncStorage
     label: ""
     group: Storage Configuration
     schema:

library/ix-dev/charts/nextcloud/templates/_configuration.tpl

@@ -60,7 +60,7 @@ secret:
       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.ncConfig.nginx.useDifferentAccessPort }}
+        {{- if .Values.ncNetwork.nginx.useDifferentAccessPort }}
           {{ $overwritehost = (printf "%v:%v" .Values.ncConfig.host .Values.ncNetwork.webPort) }}
         {{- end }}
       OVERWRITEHOST: {{ $overwritehost }}

library/ix-dev/charts/nextcloud/templates/_nginx-configuration.tpl

@@ -12,10 +12,10 @@ scaleCertificate:
   {{ $useDiffAccessPort := false }}
   {{ $externalAccessPort := "" }}
   {{/* Safely access key as it is conditionaly shown */}}
-  {{ if hasKey .Values.ncConfig "nginx" }}
-    {{ $useDiffAccessPort = .Values.ncConfig.nginx.useDifferentAccessPort }}
-    {{ $externalAccessPort = printf ":%v" .Values.ncConfig.nginx.externalAccessPort }}
-    {{ $timeout = .Values.ncConfig.nginx.proxyTimeouts | default 60 }}
+  {{ if hasKey .Values.ncNetwork "nginx" }}
+    {{ $useDiffAccessPort = .Values.ncNetwork.nginx.useDifferentAccessPort }}
+    {{ $externalAccessPort = printf ":%v" .Values.ncNetwork.nginx.externalAccessPort }}
+    {{ $timeout = .Values.ncNetwork.nginx.proxyTimeouts | default 60 }}
   {{ end }}
   {{/* If its 443, do not append it on the rewrite at all */}}
   {{ if eq $externalAccessPort ":443" }}

library/ix-dev/charts/nextcloud/templates/_nginx.tpl

@@ -26,13 +26,6 @@ workload:
                 - NET_RAW
                 - SETGID
                 - SETUID
-          {{ with .Values.ncConfig.additionalEnvs }}
-          envList:
-            {{ range $env := . }}
-            - name: {{ $env.name }}
-              value: {{ $env.value }}
-            {{ end }}
-          {{ end }}
           probes:
             liveness:
               enabled: true

library/ix-dev/charts/nextcloud/values.yaml

@@ -34,15 +34,15 @@ ncConfig:
   phpMemoryLimit: 512
   opCacheMemoryConsumption: 128
   maxExecutionTime: 30
-  nginx:
-    proxyTimeouts: 120
-    useDifferentAccessPort: false
-    externalAccessPort: 80
   additionalEnvs: []
 
 ncNetwork:
   webPort: 9001
   certificateID:
+  nginx:
+    proxyTimeouts: 120
+    useDifferentAccessPort: false
+    externalAccessPort: 80
 
 ncStorage:
   pgData: