From b8a20b3a23fc888d6a6c2237df8b3346f44a07d8 Mon Sep 17 00:00:00 2001 From: apoc4lyps Date: Thu, 4 Jan 2018 15:57:43 +0100 Subject: [PATCH 1/3] [Helper] Nextcloud: fix subdomain --- data/assets/nextcloud/nextcloud.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/assets/nextcloud/nextcloud.conf b/data/assets/nextcloud/nextcloud.conf index 49a585d2..c2dc8943 100644 --- a/data/assets/nextcloud/nextcloud.conf +++ b/data/assets/nextcloud/nextcloud.conf @@ -25,7 +25,7 @@ server { add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; - server_name NC_SERVER_SUB; + server_name NC_SUBD; root /web/nextcloud/; @@ -111,7 +111,7 @@ server { add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; - server_name NC_SERVER_SUB; + server_name NC_SUBD; root /web/nextcloud/; From c3aaae2a764ddd1d7ac5052a30fa68df07ad592b Mon Sep 17 00:00:00 2001 From: apoc4lyps Date: Thu, 4 Jan 2018 15:59:27 +0100 Subject: [PATCH 2/3] [Helper] Nextcloud: fix subdomain and background --- helper-scripts/nextcloud.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/helper-scripts/nextcloud.sh b/helper-scripts/nextcloud.sh index 781e5133..0e3504ad 100755 --- a/helper-scripts/nextcloud.sh +++ b/helper-scripts/nextcloud.sh @@ -78,10 +78,12 @@ elif [[ ${NC_INSTALL} == "y" ]]; then /web/nextcloud/occ config:system:set redis port --value=6379 --type=integer; \ /web/nextcloud/occ config:system:set memcache.locking --value='\OC\Memcache\Redis' --type=string; \ /web/nextcloud/occ config:system:set memcache.local --value='\OC\Memcache\Redis' --type=string; \ + /web/nextcloud/occ config:system:set trusted_domains 1 --value=${MAILCOW_HOSTNAME}; \ /web/nextcloud/occ config:system:set trusted_proxies 0 --value=fd4d:6169:6c63:6f77::1; \ /web/nextcloud/occ config:system:set trusted_proxies 1 --value=172.22.1.0/24; \ /web/nextcloud/occ config:system:set overwritewebroot --value=/nextcloud; \ /web/nextcloud/occ config:system:set overwritehost --value=${MAILCOW_HOSTNAME}; \ + /web/nextcloud/occ config:system:set overwriteprotocol --value=https \ /web/nextcloud/occ config:system:set mail_smtpmode --value=smtp; \ /web/nextcloud/occ config:system:set mail_smtpauthtype --value=LOGIN; \ /web/nextcloud/occ config:system:set mail_from_address --value=nextcloud; \ @@ -93,10 +95,11 @@ elif [[ ${NC_INSTALL} == "y" ]]; then /web/nextcloud/occ config:system:set user_backends 0 class --value=OC_User_IMAP" if [[ ${NC_TYPE} == "subdomain" ]]; then + docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) /web/nextcloud/occ config:system:set trusted_domains 1 --value=${NC_SUBD} docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) /web/nextcloud/occ config:system:set overwritewebroot --value=/ - docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) /web/nextcloud/occ config:system:set overwritehost --value=nextcloud.develcow.de + docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) /web/nextcloud/occ config:system:set overwritehost --value=${NC_SUBD} cp ./data/assets/nextcloud/nextcloud.conf ./data/conf/nginx/ - sed -i 's/NC_SUBD/${NC_SUBD}/g' ./data/conf/nginx/nextcloud.conf + sed -i "s/NC_SUBD/${NC_SUBD}/g" ./data/conf/nginx/nextcloud.conf elif [[ ${NC_TYPE} == "subfolder" ]]; then cp ./data/assets/nextcloud/site.nextcloud.custom ./data/conf/nginx/ fi From 06955f53127451750ecb8cd9e0d455fe246206aa Mon Sep 17 00:00:00 2001 From: apoc4lyps Date: Thu, 4 Jan 2018 16:58:02 +0100 Subject: [PATCH 3/3] Update nextcloud.sh fix typo --- helper-scripts/nextcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/nextcloud.sh b/helper-scripts/nextcloud.sh index 0e3504ad..bec53eb5 100755 --- a/helper-scripts/nextcloud.sh +++ b/helper-scripts/nextcloud.sh @@ -83,7 +83,7 @@ elif [[ ${NC_INSTALL} == "y" ]]; then /web/nextcloud/occ config:system:set trusted_proxies 1 --value=172.22.1.0/24; \ /web/nextcloud/occ config:system:set overwritewebroot --value=/nextcloud; \ /web/nextcloud/occ config:system:set overwritehost --value=${MAILCOW_HOSTNAME}; \ - /web/nextcloud/occ config:system:set overwriteprotocol --value=https \ + /web/nextcloud/occ config:system:set overwriteprotocol --value=https; \ /web/nextcloud/occ config:system:set mail_smtpmode --value=smtp; \ /web/nextcloud/occ config:system:set mail_smtpauthtype --value=LOGIN; \ /web/nextcloud/occ config:system:set mail_from_address --value=nextcloud; \