Merge branch 'master' of https://gitea.sporada.eu/sporada/selfhosted-traefik

nextcloud/live.env.tpl

@@ -14,8 +14,12 @@ REDIS_HOST_PASSWORD=password_redis
 NEXTCLOUD_ROOT=/home/compute/services/nextcloud
 NEXTCLOUD_DATA_DIR=/srv/nextcloud/data
 NEXTCLOUD_FQDN=your_nextcloud_sub_domain.domain.com
+<<<<<<< HEAD
+TRAEFIK_CONTAINER_IP=172.27.0.16 # This is the traefik container ip in the traefik_default network. I configured the traefik container with a static IP so this does not have to be changed anymore.
+=======
 # This is the IP of the Trafik container. This changes if the traefik container restarts. If it is not the current traefik container IP collabora does not work. Check the current traefik container IP with: docker inspect traefik and get the IP from the Networks -> traefik_default -> IPAddress section
 TRAEFIK_CONTAINER_IP=172.27.0.16 # This has to be the current IP of the traefik container check this with docker inspect traefik
+>>>>>>> 1febed0fecff283ba71842944efab92fbe0a649c
 PHP_MEMORY_LIMIT=2048M
 PHP_UPLOAD_LIMIT=8G
 

traefik/docker-compose.yml

@@ -3,11 +3,12 @@ version: '3.5'
 networks:
   default:
     driver: bridge
+    ipam:
+      config:
+        - subnet: 172.27.0.0/24
   socket_proxy:
-    external:
       name: socket_proxy
 
-
 services:
   # Only accept needed incoming docker API calls
   socket-proxy:
@@ -92,8 +93,9 @@ services:
     # The official v2 Traefik docker image
     image: traefik:v2.3
     networks:
-      - socket_proxy
-      - default
+      default:
+        ipv4_address: 172.27.0.100
+      socket_proxy: null
     env_file: live.env
     container_name: "traefik"
     # Enables the web UI and tells Traefik to listen to docker