diff --git a/Makefile b/Makefile index 8b45760..83f2032 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ DOCKER := docker -PROFILES := webserver database wordpress adminer uptime-kuma portainer +PROFILES := webserver database wordpress adminer uptime-kuma portainer qbittorrent PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) COMPOSE_FILES := $(shell find docker-compose*.yml | sed -e 's/^/--file /') diff --git a/caddy/bensuperpc.org/Caddyfile b/caddy/bensuperpc.org/Caddyfile index e56d34c..6f2a52f 100644 --- a/caddy/bensuperpc.org/Caddyfile +++ b/caddy/bensuperpc.org/Caddyfile @@ -44,6 +44,10 @@ uptimekuma.bensuperpc.org { reverse_proxy uptime-kuma:3001 } +torrent.bensuperpc.org { + reverse_proxy qbittorrent:8080 +} + link.bensuperpc.org { redir /rickroll https://www.youtube.com/watch?v=dQw4w9WgXcQ permanent redir /babyshark https://www.youtube.com/watch?v=XqZsoesa55w permanent diff --git a/docker-compose.yml b/docker-compose.yml index 6a9cfa4..95305aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: MYSQL_DATABASE: blog_wp command: '--default-authentication-plugin=mysql_native_password' networks: - - blog-network + - infra-network security_opt: - no-new-privileges:true @@ -37,7 +37,7 @@ services: - ./config/wordpress/php.ini:/usr/local/etc/php/conf.d/custom.ini:ro - wordpress:/var/www/html:rw networks: - - blog-network + - infra-network security_opt: - no-new-privileges:true @@ -57,7 +57,7 @@ services: - caddy_config:/config:rw - ./caddy:/etc/caddy:ro networks: - - blog-network + - infra-network security_opt: - no-new-privileges:true # cap_drop: @@ -83,7 +83,7 @@ services: - database - caddy networks: - - blog-network + - infra-network security_opt: - no-new-privileges:true @@ -96,13 +96,38 @@ services: - uptimekuma_data:/app/data restart: always networks: - - blog-network + - infra-network security_opt: - no-new-privileges:true + + qbittorrent: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent + profiles: + - qbittorrent + restart: on-failure + depends_on: + - caddy + environment: + - PUID=1000 + - PGID=1000 + - TZ=Etc/UTC + - WEBUI_PORT=8080 + - TORRENTING_PORT=6881 + volumes: + - qbittorrent_config:/config + - qbittorrent_data:/downloads + networks: + - infra-network +# ports: +# - 8080:8080 +# - 6881:6881 +# - 6881:6881/udp + networks: - blog-network: + infra-network: driver: bridge - name: blog-network + name: infra-network volumes: database: @@ -113,5 +138,9 @@ volumes: name: caddy_data caddy_config: name: caddy_config + qbittorrent_config: + name: qbittorrent_config + qbittorrent_data: + name: qbittorrent_data uptimekuma_data: name: uptimekuma_data