From 4be8a24fac0f1ba3986591dc2949227efd77d69c Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 14 Jun 2023 01:44:30 +0200
Subject: [PATCH] Add some commented lines (as documentation).

---
 FILES/Apache2/cloud-site-name.conf.php-fpm |  11 ++++++++
 FILES/images/favicon.ico                   | Bin 0 -> 1406 bytes
 install_nextcloud.sh                       |  30 +++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 FILES/images/favicon.ico

diff --git a/FILES/Apache2/cloud-site-name.conf.php-fpm b/FILES/Apache2/cloud-site-name.conf.php-fpm
index b44d4da..912963f 100644
--- a/FILES/Apache2/cloud-site-name.conf.php-fpm
+++ b/FILES/Apache2/cloud-site-name.conf.php-fpm
@@ -23,6 +23,17 @@
 
    ServerName <FULL-QUALIFIED-SITE-NAME>
 
+   # Service Discovery
+   #
+   # !! We alraedy provide this servis via '.htaccess'-file !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #RewriteEngine On
+   #RewriteRule ^/\.well-known/carddav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+   #RewriteRule ^/\.well-known/caldav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+
    #ProxyErrorOverride On
 
    <FilesMatch \.php$>
diff --git a/FILES/images/favicon.ico b/FILES/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..842fb7ef5f63750d40b09a10999cbd769109ad75
GIT binary patch
literal 1406
zcmZQzU<5(|0R|w+!H~hqz#zuJz@P!dKp_SNAO?wJ07i(&|Ns9P?6hZNNRJAPhQMeD
xjF=FBmIiSD;^u>7Km`tj2C>ok5Ltv8YVeWmfZ2_mhPVji5ttv)X^<S%008>T1y}$8

literal 0
HcmV?d00001

diff --git a/install_nextcloud.sh b/install_nextcloud.sh
index 79c1f21..4cf974c 100755
--- a/install_nextcloud.sh
+++ b/install_nextcloud.sh
@@ -4594,6 +4594,17 @@ if $apache2_installed ; then
 
    ServerName ${WEBSITE}
 
+   # Service Discovery
+   #
+   # !! We alraedy provide this servis via '.htaccess'-file !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #RewriteEngine On
+   #RewriteRule ^/\.well-known/carddav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+   #RewriteRule ^/\.well-known/caldav https://%{SERVER_NAME}/remote.php/dav/ [R=301,L]
+
    #ProxyErrorOverride On
 
    <FilesMatch \.php\$>
@@ -5152,6 +5163,25 @@ server {
       access_log off;     # Optional: Don't log access to assets
    }
 
+   # Service Discovery
+   #
+   # !! we already configured this service inside 'location ~ \.php(?:\$|/) {' !!
+   #
+   # The redirects for CalDAV or CardDAV does not work if Nextcloud is running behind a
+   # reverse proxy. The recommended solution is that your reverse proxy does the redirects
+   #
+   #rewrite ^/\.well-known/carddav https://\$server_name/remote.php/dav/ redirect;
+   #rewrite ^/\.well-known/caldav https://\$server_name/remote.php/dav/ redirect;
+   #
+   # or alternativ
+   #
+   #location /.well-known/carddav {
+   #   return 301 \$scheme://\$host/remote.php/dav;
+   #}
+   #location /.well-known/caldav {
+   #   return 301 \$scheme://\$host/remote.php/dav;
+   #}
+
    location / {
       try_files \$uri \$uri/ /index.php\$request_uri;
    }