From 4a27b6d89dc97eea24f420c80d76cee18481d1a6 Mon Sep 17 00:00:00 2001
From: Hattshire <dev@uwu.email>
Date: Tue, 29 Oct 2024 17:05:17 +0000
Subject: [PATCH] Multiple changes: * Add shell script to run nextcloud shell *
 Use local folder for Nextcloud Config * Add missing proxy image * Use Ip for
 Nextcloud Trusted Proxies (FQDN incompatibility with new update) * Use custom
 resolvers on proxy container (Fixes dns errors)

---
 docker-compose.yml           | 10 +++++++---
 images/proxy/Dockerfile      |  3 +++
 images/proxy/uploadsize.conf |  8 ++++++++
 next-shell.sh                |  1 +
 vhost.d/palta.cyou           | 10 ----------
 5 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 images/proxy/Dockerfile
 create mode 100644 images/proxy/uploadsize.conf
 create mode 100755 next-shell.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 80e7a80..4a9ea8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 volumes:
   #SSL
   certs:
@@ -19,8 +17,9 @@ services:
     restart: always
     volumes:
       - nc-data:/var/www/html
+      - ./config/nc:/var/www/html/config:rw
     environment:
-      - TRUSTED_PROXIES=palta.cyou
+      - TRUSTED_PROXIES=172.16.0.0/12 192.168.0.0/16 10.0.0.0/8 fc00::/7 fe80::/10 2001:db8::/32
       - TRUSTED_DOMAINS=palta.cyou,bard.palta.cyou
       - OVERWRITEPROTOCOL=https
 
@@ -79,6 +78,11 @@ services:
      - 443:443
     networks:
      - proxy-tier
+    environment:
+     - ENABLE_IPV6=true
+     - SHA1_UPSTREAM_NAME=true
+     - TRUST_DOWNSTREAM_PROXY=false
+     - RESOLVERS=8.8.8.8 8.8.4.4 [2001:4860:4860::8888] [2001:4860:4860::8844] valid=300s ipv6=on
 
   letsencrypt-companion:
     image: docker.io/nginxproxy/acme-companion
diff --git a/images/proxy/Dockerfile b/images/proxy/Dockerfile
new file mode 100644
index 0000000..46fc7e2
--- /dev/null
+++ b/images/proxy/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginxproxy/nginx-proxy:alpine
+
+COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/images/proxy/uploadsize.conf b/images/proxy/uploadsize.conf
new file mode 100644
index 0000000..b31b4c4
--- /dev/null
+++ b/images/proxy/uploadsize.conf
@@ -0,0 +1,8 @@
+client_max_body_size 10G;
+proxy_read_timeout 3600;
+proxy_request_buffering off;
+#client_body_temp_path /tmp/ngx 1 2;
+#proxy_buffering off;
+proxy_connect_timeout 3600;
+proxy_send_timeout 3600;
+send_timeout 3600;
diff --git a/next-shell.sh b/next-shell.sh
new file mode 100755
index 0000000..c8dff69
--- /dev/null
+++ b/next-shell.sh
@@ -0,0 +1 @@
+docker compose exec -tiu www-data nextcloud bash
diff --git a/vhost.d/palta.cyou b/vhost.d/palta.cyou
index 302ee26..0747b6f 100644
--- a/vhost.d/palta.cyou
+++ b/vhost.d/palta.cyou
@@ -1,13 +1,3 @@
-## Start of configuration add by letsencrypt container
-location ^~ /.well-known/acme-challenge/ {
-    auth_basic off;
-    auth_request off;
-    allow all;
-    root /usr/share/nginx/html;
-    try_files $uri =404;
-    break;
-}
-## End of configuration add by letsencrypt container
 # From: https://github.com/nextcloud/docker/blob/85e22b4a8e6b12d82d574c7eacd68656dac85bf5/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/uploadsize.conf
 client_max_body_size 10G;
 proxy_request_buffering off;