From a621691c65159120e313e0997f692a148c0681fb Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Thu, 24 Nov 2022 20:17:35 +0100 Subject: [PATCH] Add torrent and fix issues Signed-off-by: Bensuperpc --- Makefile | 2 +- docker-compose.yml | 122 +++++++++++------- .../{default.conf.old => default.conf} | 4 +- nginx-conf/phpmyadmin.conf | 34 ++--- nginx-conf/qbittorrent.conf | 27 ++++ 5 files changed, 123 insertions(+), 66 deletions(-) rename nginx-conf-old/{default.conf.old => default.conf} (95%) create mode 100644 nginx-conf/qbittorrent.conf diff --git a/Makefile b/Makefile index 38b2d3f..1ba6280 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ DOCKER := docker -PROFILE := db wordpress webserver certbot phpmyadmin flask +PROFILE := db wordpress webserver certbot phpmyadmin flask_website qbittorrent PROFILE_CMD := $(addprefix --profile ,$(PROFILE)) COMPOSE_FILE := docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index 5bee4b7..4acdda7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,49 +1,6 @@ version: "3.8" services: - db: - image: mariadb:10.10.2 - container_name: db - profiles: - - db - restart: unless-stopped - env_file: .env - volumes: - - dbdata:/var/lib/mysql - networks: - - app-network - - wordpress: - depends_on: - - db - image: wordpress:6.1.1-php8.1-fpm - container_name: wordpress - profiles: - - wordpress - restart: unless-stopped - env_file: .env - environment: - - WORDPRESS_DB_HOST=db:3306 - - WORDPRESS_DB_USER=$MARIADB_USER - - WORDPRESS_DB_PASSWORD=$MARIADB_PASSWORD - - WORDPRESS_DB_NAME=$MARIADB_DATABASE - volumes: - - wordpress:/var/www/html - networks: - - app-network - - flask_website: - build: - context: ./flask - dockerfile: Dockerfile - container_name: flask_website - profiles: - - flask - volumes: - - ./flask:/app:rw - restart: unless-stopped - networks: - - app-network webserver: depends_on: - wordpress @@ -61,7 +18,71 @@ services: - certbot-etc:/etc/letsencrypt:ro networks: - app-network + db: + image: mariadb:10.10.2 + container_name: db + profiles: + - db + restart: unless-stopped + env_file: + - .env + volumes: + - dbdata:/var/lib/mysql + networks: + - app-network + wordpress: + depends_on: + - db + image: wordpress:6.1.1-php8.1-fpm + container_name: wordpress + profiles: + - wordpress + restart: unless-stopped + env_file: + - .env + environment: + - WORDPRESS_DB_HOST=db:3306 + - WORDPRESS_DB_USER=$MARIADB_USER + - WORDPRESS_DB_PASSWORD=$MARIADB_PASSWORD + - WORDPRESS_DB_NAME=$MARIADB_DATABASE + volumes: + - wordpress:/var/www/html + networks: + - app-network + + flask_website: + build: + context: ./flask + dockerfile: Dockerfile + container_name: flask_website + profiles: + - flask_website + volumes: + - ./flask:/app:rw + restart: unless-stopped + networks: + - app-network + qbittorrent: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent + profiles: + - qbittorrent + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/London + - WEBUI_PORT=8080 + #volumes: + # - /path/to/appdata/config:/config + # - /path/to/downloads:/downloads + #ports: + # - 8080:8080 + # - 6881:6881 + # - 6881:6881/udp + restart: unless-stopped + networks: + - app-network certbot: depends_on: - webserver @@ -81,7 +102,8 @@ services: profiles: - phpmyadmin restart: unless-stopped - env_file: .env + env_file: + - .env environment: - MYSQL_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD - MYSQL_USER=$MARIADB_USER @@ -92,10 +114,14 @@ services: networks: - app-network volumes: - certbot-etc: {} - wordpress: {} - dbdata: {} + certbot-etc: + name: certbot-etc + wordpress: + name: wordpress + dbdata: + name: dbdata networks: app-network: - driver: bridge \ No newline at end of file + driver: bridge + name: app-network \ No newline at end of file diff --git a/nginx-conf-old/default.conf.old b/nginx-conf-old/default.conf similarity index 95% rename from nginx-conf-old/default.conf.old rename to nginx-conf-old/default.conf index 3e85dc3..8378331 100644 --- a/nginx-conf-old/default.conf.old +++ b/nginx-conf-old/default.conf @@ -2,7 +2,7 @@ server { listen 80; listen [::]:80; - server_name bensuperpc.org www.bensuperpc.org; + server_name your_domain www.your_domain; index index.php index.html index.htm; @@ -41,4 +41,4 @@ server { expires max; log_not_found off; } -} +} \ No newline at end of file diff --git a/nginx-conf/phpmyadmin.conf b/nginx-conf/phpmyadmin.conf index 9a2c391..1e981e0 100644 --- a/nginx-conf/phpmyadmin.conf +++ b/nginx-conf/phpmyadmin.conf @@ -1,4 +1,4 @@ -include /etc/nginx/conf.d/sub/cache-proxy.conf; +#include /etc/nginx/conf.d/sub/cache-proxy.conf; upstream phpmyadmin_server { # ip_hash; @@ -20,23 +20,27 @@ server { location / { proxy_pass http://phpmyadmin_server; proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host:$server_port; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-For $remote_addr; + + #proxy_set_header Host $host; + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-Proto $scheme; + #proxy_set_header X-Forwarded-Host $host:$server_port; + #proxy_set_header X-Forwarded-Server $host; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_cache PROXY; - proxy_cache_valid 200 302 10m; - proxy_cache_valid 301 1h; - proxy_cache_valid any 1m; - proxy_cache_lock on; + # Uncomment if you want to enable proxy cache + #proxy_cache PROXY; + #proxy_cache_valid 200 302 10m; + #proxy_cache_valid 301 1h; + #proxy_cache_valid any 1m; + #proxy_cache_lock on; - proxy_ignore_headers Vary; - proxy_hide_header Vary; + #proxy_ignore_headers Vary; + #proxy_hide_header Vary; - add_header X-cache $upstream_cache_status; + #add_header X-cache $upstream_cache_status; } # resolver 8.8.8.8; diff --git a/nginx-conf/qbittorrent.conf b/nginx-conf/qbittorrent.conf new file mode 100644 index 0000000..e0456ce --- /dev/null +++ b/nginx-conf/qbittorrent.conf @@ -0,0 +1,27 @@ +upstream qbittorrent_server { + # ip_hash; + server qbittorrent:8080; + # server qbittorrent:8080 weight=1 max_fails=3 fail_timeout=30s; +} + +# PHPmyadmin +server { + listen 80; + listen [::]:80; + #listen 443; + #listen [::]:443; + + server_name qbittorrent.bensuperpc.org www.qbittorrent.bensuperpc.org; + + include /etc/nginx/conf.d/sub/gzip.conf; + + location / { + proxy_pass http://qbittorrent_server; + proxy_redirect off; + proxy_set_header X-Forwarded-Host $http_host; + #proxy_set_header X-Forwarded-Host $host:$server_port; + proxy_set_header X-Forwarded-For $remote_addr; + } + + # resolver 8.8.8.8; +}