From 5ad6a42fa2b97d13b76ef37b6687f214ed2c7b20 Mon Sep 17 00:00:00 2001
From: Moritz Graf <github@moritzgraf.de>
Date: Sun, 24 Apr 2022 17:55:45 +0200
Subject: [PATCH] Current working version of NExtcloud when using the correct
 caldav URL

---
 k8s/README.md                      |  8 +++-
 k8s/nextcloud/nextcloud.secret.yml | 66 ++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/k8s/README.md b/k8s/README.md
index 4b9513c..4200534 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -352,10 +352,12 @@ kubectl apply $(ls octobot-fabi/*.yaml | awk ' { print " -f " $1 } ')
 
 [Chart GitHub](https://github.com/nextcloud/helm/tree/master/charts/nextcloud)
 
+[Configuring Nextcloud](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/index.html)
+
 ```sh
 helm repo add nextcloud https://nextcloud.github.io/helm/
 helm repo update
-helm upgrade --install nextcloud nextcloud/nextcloud -n nextcloud --version 2.14.1 -f nextcloud/nextcloud.secret.yml
+helm upgrade --install nextcloud nextcloud/nextcloud -n nextcloud --version 2.14.2 -f nextcloud/nextcloud.secret.yml
 helm upgrade --install nextcloud-phpmyadmin bitnami/phpmyadmin -n nextcloud -f nextcloud/nextcloud-phpmyadmin.yml
 ```
 
@@ -373,6 +375,10 @@ kubectl delete sts/nextcloud-redis-master -n nextcloud
 kubectl delete deployment nextcloud -n nextcloud
 ```
 
+SyncURL for DavX5 =>  https://cloud.haumdaucher.de/remote.php/dav/principals/users/moritz/
+
+Unknown why normal url is not working. See https://help.nextcloud.com/t/davx5-couldnt-find-caldav-or-carddav-service/68669
+
 ### backup & restore
 
 #TODO with Velero
diff --git a/k8s/nextcloud/nextcloud.secret.yml b/k8s/nextcloud/nextcloud.secret.yml
index 63879a1..c13f2b4 100644
--- a/k8s/nextcloud/nextcloud.secret.yml
+++ b/k8s/nextcloud/nextcloud.secret.yml
@@ -1,6 +1,6 @@
-phpClientHttpsFix:
-  enabled: "true" 
-  protocol: "https"
+# phpClientHttpsFix:
+#   enabled: "true" 
+#   protocol: "https"
 
 
 ingress:
@@ -15,30 +15,36 @@ ingress:
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     kubernetes.io/tls-acme: "true"
     nginx.ingress.kubernetes.io/proxy-body-size: 4G
-    nginx.ingress.kubernetes.io/server-snippet: |-
-      server_tokens off;
-      proxy_hide_header X-Powered-By;
+    ##################
+    # alternative nginx configs
+      #server_tokens off;
+      #proxy_hide_header X-Powered-By;
+
+      #rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
+      #rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+      #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json;
+      #location = /.well-known/carddav {
+      #  return 301 $scheme://$host/remote.php/dav;
+      #}
+      #location = /.well-known/caldav {
+      #  return 301 $scheme://$host/remote.php/dav;
+      #}
+      #location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
+      #  deny all;
+      #}
+      #location ~ ^/(?:autotest|occ|issue|indie|db_|console) {
+      #  deny all;
+      #}
+    nginx.ingress.kubernetes.io/server-snippet: |-
+      rewrite ^/\.well-known/carddav https://$server_name/remote.php/dav/ redirect;
+      rewrite ^/\.well-known/caldav https://$server_name/remote.php/dav/ redirect;
 
-      rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
-      rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
-      rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json;
-      location = /.well-known/carddav {
-        return 301 $scheme://$host/remote.php/dav;
-      }
-      location = /.well-known/caldav {
-        return 301 $scheme://$host/remote.php/dav;
-      }
       location = /robots.txt {
         allow all;
         log_not_found off;
         access_log off;
       }
-      location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
-        deny all;
-      }
-      location ~ ^/(?:autotest|occ|issue|indie|db_|console) {
-        deny all;
-      }
+
   tls:
   - hosts:
     - "cloud.haumdaucher.de"
@@ -59,6 +65,24 @@ nextcloud:
         ),
         'forwarded_for_headers' => array('HTTP_X_FORWARDED_FOR'),
       );
+    overwrite.config.php: |-
+      <?php
+      $CONFIG = array(
+        /**
+        * When generating URLs, Nextcloud attempts to detect whether the server is
+        * accessed via ``https`` or ``http``. However, if Nextcloud is behind a proxy
+        * and the proxy handles the ``https`` calls, Nextcloud would not know that
+        * ``ssl`` is in use, which would result in incorrect URLs being generated.
+        * Valid values are ``http`` and ``https``.
+        */
+        'overwritehost' => 'cloud.haumdaucher.de',
+        'overwriteprotocol' => 'https',
+      );
+    region.config.php: |-
+     <?php 
+     $CONFIG = array(
+      'default_phone_region' => 'DE',
+     );
 cronjob:
   enabled: true
 internalDatabase: