tweaked nginx and qbittorrent

qbittorrent/README.md

@@ -2,13 +2,42 @@
 
 https://github.com/Trigus42/alpine-qbittorrentvpn
 
+"Docker container which runs the latest qBittorrent-nox client while connecting to WireGuard or OpenVPN with netfilter killswitch to prevent IP leakage when the tunnel goes down."
+
+## Default username
+
+Admin
+
 ## WireGuard
 
 The container will fail to boot if VPN_ENABLED is set and there is no valid INTERFACE.conf file present in the /config/wireguard directory. Drop a .conf file from your VPN provider into /config/wireguard and start the container again.
 
     Recommended INTERFACE names include wg0 or wgvpn0 or even wgmgmtlan0. However, the number at the end is in fact optional, and really any free-form string [a-zA-Z0-9_=+.-]{1,15} will work. So even interface names corresponding to geographic locations would suffice, such as cincinnati, nyc, or paris, if that's somehow desirable. [source]
 
-
-
 ## Ensure Permissions
 chmod 600 /path/to/wg0.conf
+
+
+## Setup
+
+env file
+```text
+# qbittorrent
+COOKBOOK=/home/user/git/docker-compose-cookbooks #HELP: cookbooks
+VOL_PATH=/project-dir/project-name/data #HELP: volpath
+QBT_IMAGE=trigus42/qbittorrentvpn:latest
+QBT_PASS=01234567890 #HELP: #HELP: gen32
+```
+
+extends file
+```yaml
+version: '3.4'
+
+services:
+	  qbittorrent:
+      extends:
+        file: ${COOKBOOK}/qbittorrent/docker-compose.yml
+        service: qbittorrent
+      env_file:
+        - .env
+```

qbittorrent/docker-compose.yml

@@ -1,18 +1,15 @@
 version: "3.3"
 
-# Username Admin
-
 services:
   qbittorrent:
-    image: trigus42/qbittorrentvpn
-    container_name: qbittorrent
+    image: ${QBT_IMAGE:-trigus42/qbittorrentvpn:latest}
     environment:
       - VPN_TYPE=wireguard
-      - WEBUI_PASSWORD=${QBIT_PASSWORD:-ChangeMePass}
+      - WEBUI_PASSWORD=${QBT_PASS:-ChangeMePass}
     volumes:
-      - './data/config/:/config'
-      - './data/downloads/:/downloads'
-      - './data/incomplete/:/incomplete'
+      - "${VOL_PATH:-./data}/config:/config"
+      - "${VOL_PATH:-./data}/downloads:/downloads"
+      - "${VOL_PATH:-./data}/incomplete:/incomplete"
       - '/dev/net/tun:/dev/net/tun'
     ports:
      - 8080:8080

qbittorrent/sample-extends.yml

@@ -0,0 +1,9 @@
+version: '3.4'
+
+services:
+	  qbittorrent:
+      extends:
+        file: ${COOKBOOK}/qbittorrent/docker-compose.yml
+        service: qbittorrent
+      env_file:
+        - .env

qbittorrent/sample.env

@@ -0,0 +1,5 @@
+# qbittorrent
+COOKBOOK=/home/user/git/docker-compose-cookbooks #HELP: cookbooks
+VOL_PATH=/project-dir/project-name/data #HELP: volpath
+QBT_IMAGE=trigus42/qbittorrentvpn:latest
+QBT_PASS=01234567890 #HELP: gen32