Merge branch 'main' into feature/collabora-subchart

Signed-off-by: Jesse Hitch <[email protected]>
nextcloud · Oct 20, 2024 · dff46df · dff46df
2 parents dfebdd3 + 1c5aecd
commit dff46df
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nextcloud
-version: 6.1.0
-appVersion: 30.0.0
+version: 6.2.0
+appVersion: 30.0.1
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
   - nextcloud

diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -161,6 +161,7 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `nginx.image.pullPolicy`                                    | nginx Image pull policy                                                                             | `IfNotPresent`             |
 | `nginx.image.pullPolicy`                                    | nginx Image pull policy                                                                             | `IfNotPresent`             |
 | `nginx.containerPort`                                       | Customize container port e.g. when not running as root                                              | `IfNotPresent`             |
+| `nginx.ipFamilies`                                          | Customize container to listen on IPv4, IPv6 or both                                                 | `["IPv4"]`                 |
 | `nginx.config.default`                                      | Whether to use nextcloud's recommended nginx config                                                 | `true`                     |
 | `nginx.config.custom`                                       | Specify a custom config for nginx                                                                   | `{}`                       |
 | `nginx.resources`                                           | nginx resources                                                                                     | `{}`                       |

diff --git a/charts/nextcloud/files/nginx.config.tpl b/charts/nextcloud/files/nginx.config.tpl
@@ -3,7 +3,16 @@ upstream php-handler {
 }
 
 server {
+    {{- if and (has "IPv4" .Values.nginx.ipFamilies) (has "IPv6" .Values.nginx.ipFamilies) }}
+    # Both IPv4 and IPv6 are enabled
+    listen [::]:{{ .Values.nginx.containerPort }} ipv6only=off;
+    {{- else if and (not (has "IPv4" .Values.nginx.ipFamilies)) (has "IPv6" .Values.nginx.ipFamilies) }}
+    # Only IPv6 is enabled
+    listen [::]:{{ .Values.nginx.containerPort }};
+    {{- else }}
+    # Default, IPv4 only
     listen {{ .Values.nginx.containerPort }};
+    {{- end }}
 
     # HSTS settings
     # WARNING: Only add the preload option once you read about
@@ -48,7 +57,7 @@ server {
     include mime.types;
     types {
         text/javascript js mjs;
-    }        
+    }
 
     # Path to the root of your installation
     root /var/www/html;

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -324,7 +324,10 @@ nginx:
     pullPolicy: IfNotPresent
 
   containerPort: 80
-
+  # This configures nginx to listen on either IPv4, IPv6 or both
+  ipFamilies:
+    - IPv4
+    # - IPv6
   config:
     # This generates the default nginx config as per the nextcloud documentation
     default: true