Merge branches 'master' and 'remote_setup' of https://gitea.sporada.eu/sporada/selfhosted-traefik

traefik/docker-compose.yml

@@ -110,7 +110,10 @@ services:
       - "--providers.docker.exposedbydefault=false"
       # Entrypoints (not HTTPS)
       - "--entrypoints.web.address=:80"
+<<<<<<< HEAD
       #- "--entrypoints.teamspeak.address=:9987/udp"
+=======
+>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
       # HTTPS (websecure entrypoint)
       - "--entrypoints.websecure.address=:443"
       # TS3 entrypoints
@@ -142,7 +145,10 @@ services:
       - "traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)"
       - "traefik.http.routers.http_catchall.entrypoints=web"
       - "traefik.http.routers.http_catchall.middlewares=https-redirect"
+<<<<<<< HEAD
 
+=======
+>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
     ports:
       # The HTTP port
       - "80:80"