From cbbe08662d844373b71621269085c1bbc3fe56b3 Mon Sep 17 00:00:00 2001
From: Francesco Picone <f.picone92@gmail.com>
Date: Mon, 16 Mar 2026 11:09:43 +0100
Subject: [PATCH] ++ fix network & other

---
 .env               |  8 +++++++-
 docker-compose.yml | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index 00a5575..1a92138 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,18 @@
+PROJECT_NAME=drive
+
+RESTART=unless-stopped
+
 TZ=Europe/Rome
 
 NEXTCLOUD_DOMAIN=drive.pyconetwork.it
 NEXTCLOUD_DOMAIN_REGEX=drive\\.pyconetwork\\.it
 TRUSTED_PROXY_IP=192.168.4.4
-TRUSTED_PROXIES=192.168.4.4 172.30.0.10
+TRUSTED_PROXIES=${TRUSTED_PROXY_IP} ${NGINX_IP_ADDRESS}
 
 # Unica porta pubblicata sul nodo Docker: il reverse proxy punta a nginx.
 NGINX_PORT=8383
+NGINX_IP_ADDRESS=172.40.0.10
+NGINX_NETWORK=172.40.0.0/24
 
 MYSQL_DATABASE=nextcloud
 MYSQL_USER=nextcloud
diff --git a/docker-compose.yml b/docker-compose.yml
index f01d1cb..0a106bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 services:
   nginx:
     image: nginx:1.27-alpine
-    container_name: nextcloud-nginx
-    restart: unless-stopped
+    container_name: ${PROJECT_NAME}-nextcloud-nginx
+    restart: ${RESTART}
     depends_on:
       - app
       - collabora
@@ -12,12 +12,12 @@ services:
       - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
     networks:
       nextcloud_internal:
-        ipv4_address: 172.30.0.10
+        ipv4_address: ${NGINX_IP_ADDRESS}
 
   db:
     image: mariadb:11.4
-    container_name: nextcloud-db
-    restart: unless-stopped
+    container_name: ${PROJECT_NAME}-nextcloud-db
+    restart: ${RESTART}
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     environment:
       MYSQL_DATABASE: ${MYSQL_DATABASE}
@@ -32,16 +32,16 @@ services:
 
   redis:
     image: redis:7-alpine
-    container_name: nextcloud-redis
-    restart: unless-stopped
+    container_name: ${PROJECT_NAME}-nextcloud-redis
+    restart: ${RESTART}
     command: redis-server --requirepass ${REDIS_PASSWORD}
     networks:
       - nextcloud_internal
 
   app:
     image: nextcloud:apache
-    container_name: nextcloud-app
-    restart: unless-stopped
+    container_name: ${PROJECT_NAME}-nextcloud-app
+    restart: ${RESTART}
     depends_on:
       - db
       - redis
@@ -69,8 +69,8 @@ services:
 
   collabora:
     image: collabora/code:latest
-    container_name: collabora
-    restart: unless-stopped
+    container_name: ${PROJECT_NAME}-collabora
+    restart: ${RESTART}
     expose:
       - "9980"
     environment:
@@ -94,4 +94,4 @@ networks:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.30.0.0/24
+        - subnet: ${NGINX_NETWORK}