From fd50bc32cda7de5beb42a69b7e51571da1299471 Mon Sep 17 00:00:00 2001
From: Hattshire <dev@uwu.email>
Date: Thu, 5 Oct 2023 07:55:07 +0000
Subject: [PATCH] Use nginx instead of apache

---
 docker-compose.yml | 40 +++++++++++++++++++---------------------
 nc_config.env      | 11 +++++++++++
 2 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 nc_config.env

diff --git a/docker-compose.yml b/docker-compose.yml
index e4c5ead..ff468b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,43 +15,29 @@ networks:
 services:
 # ============ NextCloud
   nextcloud:
-    build: ./images/nc
+    image: nextcloud:25.0-fpm
     restart: always
-    expose:
-      - 80
     volumes:
       - nc-data:/var/www/html
     environment:
-      - VIRTUAL_HOST=palta.cyou
-      - LETSENCRYPT_HOST=palta.cyou
-      - APACHE_DISABLE_REWRITE_IP=1
       - TRUSTED_PROXIES=palta.cyou
       - TRUSTED_DOMAINS=palta.cyou,bard.palta.cyou
       - OVERWRITEPROTOCOL=https
-      - NEXTCLOUD_ADMIN_USER=Super
-      - "NEXTCLOUD_ADMIN_PASSWORD=&3Qv%CQCGp>zs-!f"
-      - OBJECTSTORE_S3_HOST=s3.us-west-001.backblazeb2.com
-      - OBJECTSTORE_S3_BUCKET=paltas
-      - OBJECTSTORE_S3_KEY=001602c9b6d6e420000000001
-      - OBJECTSTORE_S3_SECRET=K001WXz69MkRgVKk+7DP4mwbZYXe2fQ
-      - OBJECTSTORE_S3_PORT=443
-      - OBJECTSTORE_S3_SSL=true
-      - OBJECTSTORE_S3_REGION=us-west-001
-      - OBJECTSTORE_S3_USEPATH_STYLE=true
+
       - POSTGRES_HOST=db
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - nc_config.env
     networks:
       - default
       - proxy-tier
     depends_on:
-      - reverse_proxy
       - db
       - redis
 
   nextcloud-janitor:
-    build: ./images/nc
+    image: nextcloud:25.0-fpm
     restart: always
     volumes:
       - nc-data:/var/www/html
@@ -60,9 +46,21 @@ services:
       - db
       - redis
 
-#  nextcloud-front:
-#    build: ./images/ngx
-#    restart: always
+  nextcloud-front:
+    build: ./images/ngx
+    restart: always
+    environment:
+      - VIRTUAL_HOST=palta.cyou
+      - LETSENCRYPT_HOST=palta.cyou
+
+    volumes:
+      - nc-data:/var/www/html:ro
+
+    depends_on:
+      - nextcloud
+    networks:
+      - default
+      - proxy-tier
 
 # =========== SSL
 
diff --git a/nc_config.env b/nc_config.env
new file mode 100644
index 0000000..3bce8ad
--- /dev/null
+++ b/nc_config.env
@@ -0,0 +1,11 @@
+NEXTCLOUD_ADMIN_USER=Admin
+NEXTCLOUD_ADMIN_PASSWORD=
+
+OBJECTSTORE_S3_HOST=s3.host
+OBJECTSTORE_S3_BUCKET=nextcloud
+OBJECTSTORE_S3_KEY=
+OBJECTSTORE_S3_SECRET=
+OBJECTSTORE_S3_PORT=443
+OBJECTSTORE_S3_SSL=true
+OBJECTSTORE_S3_REGION=
+OBJECTSTORE_S3_USEPATH_STYLE=true