From 81c5fbacbbefa11caedd0ad176cd00b04e82c33d Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 3 Oct 2021 19:32:44 +0200
Subject: [PATCH] deluge and nginx streaming

---
 .env.default                               |  1 +
 deluge/docker-compose.deluge.yml           | 33 +++++-----------------
 nginx-proxy/docker-compose.nginx-local.yml |  5 ++--
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/.env.default b/.env.default
index ca14622..f34dfd5 100644
--- a/.env.default
+++ b/.env.default
@@ -6,6 +6,7 @@ DOMAIN=localhost.localdomain
 HOST_BAIKAL=baikal
 HOST_BLOG=blog
 HOST_DELUGE=deluge
+HOST_DELUGE_DOWNLOAD=delugedownload
 HOST_DOKUWIKI=dokuwiki
 HOST_GLANCES=glances
 HOST_MAIL=mail
diff --git a/deluge/docker-compose.deluge.yml b/deluge/docker-compose.deluge.yml
index 99f9b65..0924eb5 100755
--- a/deluge/docker-compose.deluge.yml
+++ b/deluge/docker-compose.deluge.yml
@@ -17,19 +17,10 @@ services:
       - ${DELUGE_TORRENT_PORT}:${DELUGE_TORRENT_PORT}/udp
     volumes:
       - deluge_config:/config:rw
-      - deluge_downloads:/downloads:rw      
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.deluge.rule=Host(`${HOST_WWW}.${DOMAIN}`) && PathPrefix(`${PATH_DELUGE}`) 
-      - traefik.http.routers.deluge.entrypoints=websecure
-      - traefik.http.routers.deluge.tls=true
-      - traefik.http.services.deluge.loadbalancer.server.port=8112
-      - traefik.http.routers.deluge.middlewares=delugeHeader,sameOriginHeader,delugeRedir,delugePStrip
-      - traefik.http.middlewares.delugeHeader.headers.customrequestheaders.X-Deluge-Base=${PATH_DELUGE}/
-      - traefik.http.middlewares.sameOriginHeader.headers.customrequestheaders.X-Frame-Options=SAMEORIGIN
-      - traefik.http.middlewares.delugePStrip.stripprefix.prefixes=${PATH_DELUGE}
-      - traefik.http.middlewares.delugeRedir.redirectregex.regex=^(.*)${PATH_DELUGE}$$
-      - traefik.http.middlewares.delugeRedir.redirectregex.replacement=$${1}${PATH_DELUGE}/        
+      - deluge_downloads:/downloads:rw
+    environment:
+      - VIRTUAL_HOST=${HOST_DELUGE}.${DOMAIN}
+      - VIRTUAL_PORT=8112            
 
   torrent:
     container_name: torrent
@@ -41,19 +32,9 @@ services:
       - deluge_downloads:/downloads:ro
     expose:
       - 80
-    # shortcut to bypass traefik limitation
-    ports:
-      - ${DOWNLOAD_HTTP_PORT}:80
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.torrent.rule=Host(`${HOST_WWW}.${DOMAIN}`) && PathPrefix(`${PATH_TORRENT}`) 
-      - traefik.http.routers.torrent.entrypoints=websecure
-      - traefik.http.routers.torrent.tls=true
-      - traefik.http.services.torrent.loadbalancer.server.port=80
-      - traefik.http.routers.torrent.middlewares=torrentRedir,torrentPStrip
-      - traefik.http.middlewares.torrentPStrip.stripprefix.prefixes=${PATH_TORRENT}
-      - traefik.http.middlewares.torrentRedir.redirectregex.regex=^(.*)${PATH_TORRENT}$$
-      - traefik.http.middlewares.torrentRedir.redirectregex.replacement=$${1}${PATH_TORRENT}/            
+    environment:
+      - VIRTUAL_HOST=${HOST_DELUGE_DOWNLOAD}.${DOMAIN}
+      - HTTPS_METHOD=nohttps         
     
 volumes:
   deluge_config:
diff --git a/nginx-proxy/docker-compose.nginx-local.yml b/nginx-proxy/docker-compose.nginx-local.yml
index 8e40245..09a586c 100755
--- a/nginx-proxy/docker-compose.nginx-local.yml
+++ b/nginx-proxy/docker-compose.nginx-local.yml
@@ -8,11 +8,12 @@ services:
       - 80:80
       - 443:443 
     environment:
-      - DEFAULT_HOST=${DOMAIN}
+      - DEFAULT_HOST=${HOST_WWW}.${DOMAIN}
       - DHPARAM_GENERATION=false
     networks:
       - srv             
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ${ROOT_INSTALL}/data/nginx-proxy/certs:/etc/nginx/certs
-      - ${ROOT_INSTALL}/data/nginx-proxy/vhost.d:/etc/nginx/vhost.d:ro
\ No newline at end of file
+      - ${ROOT_INSTALL}/data/nginx-proxy/vhost.d:/etc/nginx/vhost.d:ro
+      - ${ROOT_INSTALL}/data/nginx-proxy/htpasswd:/etc/nginx/htpasswd
\ No newline at end of file