diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 631b6ea..e3052a8 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -69,26 +69,7 @@ services: - "traefik.docker.network=web" - "docker.group=monitoring" - - uptime-kuma: - image: louislam/uptime-kuma:1 - volumes: - - ${VOLUMES_PATH}/monitoring/uptime-kuma-data:/app/data - networks: - - web - - dockersocket - restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.uptimekuma.rule=Host(`uptime.${DOMAIN}`)" - - "traefik.http.routers.uptimekuma.entrypoints=web" - - "traefik.http.services.uptimekuma.loadbalancer.server.port=3001" - - "traefik.docker.network=web" - - "docker.group=monitoring" - networks: monitoring: web: external: true - dockersocket: - external: true diff --git a/start-all.sh b/start-all.sh index 768dc4f..32659e9 100755 --- a/start-all.sh +++ b/start-all.sh @@ -14,4 +14,3 @@ up download; up portainer; up torrent; up print; -up media; diff --git a/torrent/docker-compose.yaml b/torrent/docker-compose.yaml index 35fccaf..5503068 100644 --- a/torrent/docker-compose.yaml +++ b/torrent/docker-compose.yaml @@ -1,28 +1,32 @@ services: - - transmission: - image: lscr.io/linuxserver/transmission:${TRANSMISSION_VERSION} - environment: - - TZ=Etc/UTC - - USER=${USERNAME} - - PASS=${PASSWORD} - volumes: - - ${VOLUMES_PATH}/torrent/transmission:/config - - ${DOWNLOAD_PATH}:/downloads - - ${DOWNLOAD_PATH}/watch:/watch - networks: - - web - ports: -# - 9091:9091 - - 51413:51413 - - 51413:51413/udp - restart: unless-stopped - labels: + qbittorrent: + image: linuxserver/qbittorrent + environment: +# - PUID=1000 +# - PGID=1000 + - TZ=Europe/Berlin + - WEBUI_PORT=8090 + volumes: + - ${VOLUMES_PATH}/torrent:/config + - ${DOWNLOAD_PATH}/:/downloads + ports: + - 6881:6881 + - 6881:6881/udp +# - 8090:8090 + networks: + - web + labels: - "traefik.enable=true" - "traefik.http.routers.torrent.rule=Host(`torrent.${DOMAIN}`)" - "traefik.http.routers.torrent.entrypoints=web" - - "traefik.http.services.torrent.loadbalancer.server.port=9091" + - "traefik.http.services.torrent.loadbalancer.server.port=8090" + - "traefik.http.services.torrent.loadbalancer.passhostheader=false" + - "traefik.http.middlewares.torrentHeader.headers.customRequestHeaders.X-Frame-Options=SAMEORIGIN" + - "traefik.http.middlewares.torrentHeader.headers.customRequestHeaders.Referer=" + - "traefik.http.middlewares.torrentHeader.headers.customRequestHeaders.Origin=" + - "traefik.http.routers.torrent.middlewares=torrentHeader" - "docker.group=torrent" + restart: unless-stopped networks: web: