From a534092234544a704810d4661ee31d41c5be3b5e Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Fri, 20 Sep 2024 23:34:39 +0300 Subject: [PATCH 1/6] transmission. Draft added. --- README.md | 1 + transmission/.env.dist | 24 +++++++++++++++++++++++ transmission/config/.gitignore | 2 ++ transmission/docker-compose.yml | 33 ++++++++++++++++++++++++++++++++ transmission/download/.gitignore | 2 ++ transmission/watch/.gitignore | 2 ++ 6 files changed, 64 insertions(+) create mode 100644 transmission/.env.dist create mode 100644 transmission/config/.gitignore create mode 100644 transmission/docker-compose.yml create mode 100644 transmission/download/.gitignore create mode 100644 transmission/watch/.gitignore diff --git a/README.md b/README.md index ea8c9b1..13a7878 100644 --- a/README.md +++ b/README.md @@ -78,5 +78,6 @@ Not every stack is tested to fully work. | Telegram RSS Bot | ✅ | `miroslavsckaya/tg-rss-bot` | Telegram RSS Bot by @Miroslavsckaya. | [Gitea](https://git.skobk.in/Miroslavsckaya/tg_rss_bot/), [Github Mirror](https://github.com/Miroslavsckaya/tg_rss_bot) | | Tor OBFS4 Bridge | ✅ | `thetorproject/obfs4-bridge` | Tor OBFS4 Bridge for Tor blocking bypass. | [Website](https://community.torproject.org/relay/setup/bridge/), [Gitlab](https://gitlab.torproject.org/tpo/anti-censorship/docker-obfs4-bridge), [Manual](https://community.torproject.org/relay/setup/bridge/docker/) | | Tor Privoxy | ✅ | `registry.gitlab.com/skobkin/torproxy-obfs4` | Tor image with integrated privoxy and OBFS4 bridge support. | [Original image Github](https://github.com/dperson/torproxy), [OBFS4 support image Gitlab](https://gitlab.com/skobkin/torproxy-obfs4) | +| Transmission | ✅ | `lscr.io/linuxserver/transmission` | Torrent client suitable for NAS. | [Github](https://github.com/linuxserver/docker-transmission), [LinuxServer Fleet](https://hub.docker.com/r/linuxserver/transmission) | | Watchtower | ✅ | `containrrr/watchtower` | Docker container auto-update daemon. | [Website](https://containrrr.dev/watchtower/), [Github](https://github.com/containrrr/watchtower) | | Webhook.site | | `webhooksite/webhook.site` | HTTP callback testing tool | [Website](https://webhook.site), [Github](https://github.com/webhooksite/webhook.site) | diff --git a/transmission/.env.dist b/transmission/.env.dist new file mode 100644 index 0000000..6c6b0d2 --- /dev/null +++ b/transmission/.env.dist @@ -0,0 +1,24 @@ +# https://hub.docker.com/r/linuxserver/transmission + +IMAGE_TAG=latest + +AUTH_USER=username +AUTH_PASSWORD=*ChangeThis* + +USER_ID=1000 +GROUP_ID=1000 +#UMASK=022 + +P2P_PORT=6882 +WEB_PORT=9091 + +#NETWORK_MODE=host + +DIR_CONFIG=./config +DIR_DOWNLOAD=./download +DIR_WATCH=./watch + +TIMEZONE=Europe/Moscow + +LOG_MAX_SIZE=5m +LOG_MAX_FILE=5 diff --git a/transmission/config/.gitignore b/transmission/config/.gitignore new file mode 100644 index 0000000..a68d087 --- /dev/null +++ b/transmission/config/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml new file mode 100644 index 0000000..9f5a158 --- /dev/null +++ b/transmission/docker-compose.yml @@ -0,0 +1,33 @@ +services: + transmission: + image: 'lscr.io/linuxserver/transmission:${IMAGE_TAG:-latest}' + container_name: 'transmission' + environment: + - 'PUID=${USER_ID:-1000}' + - 'PGID=${GROUP_ID:-1000}' + - 'TZ=${TIMEZONE:-Europe/Moscow}' + #- TRANSMISSION_WEB_HOME= #optional + - 'USER=${AUTH_USER}' + - 'PASS=${AUTH_PASSWORD}' + #- WHITELIST= #optional + - 'PEERPORT=${P2P_PORT:-6882}' + #- HOST_WHITELIST= #optional + env_file: '.env' + volumes: + - '${DIR_CONFIG:-./config}:/config' + - '${DIR_DOWNLOAD:-./download}:/downloads' + # Separate download cache directory in case you store unfinished torrents on SSD + # Use with `"incomplete-dir-enabled": true` in the settings.json. This is `incomplete-dir` parameter. + - '${DIR_TMP_DOWNLOAD:-/dev/null}:${DIR_TMP_DOWNLOAD:-/dev/null}' + - '${DIR_WATCH:-./watch}:/watch' + network_mode: '${NETWORK_MODE:-bridge}' + ports: + - '${WEB_PORT:-9091}:${WEB_PORT:-9091}' + - '${P2P_PORT:-51413}:${P2P_PORT:-51413}' + - '${P2P_PORT:-51413}:${P2P_PORT:-51413}/udp' + restart: unless-stopped + logging: + driver: 'json-file' + options: + max-size: '${LOG_MAX_SIZE:-5m}' + max-file: '${LOG_MAX_FILE:-5}' diff --git a/transmission/download/.gitignore b/transmission/download/.gitignore new file mode 100644 index 0000000..a68d087 --- /dev/null +++ b/transmission/download/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore diff --git a/transmission/watch/.gitignore b/transmission/watch/.gitignore new file mode 100644 index 0000000..a68d087 --- /dev/null +++ b/transmission/watch/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore -- 2.43.5 From 1be823c720b65fa3925168bb08c8345e82f06a96 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Fri, 20 Sep 2024 23:35:07 +0300 Subject: [PATCH 2/6] murmur. Removing TODO comment (won't fix). --- murmur/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/murmur/docker-compose.yml b/murmur/docker-compose.yml index a463bef..4835855 100644 --- a/murmur/docker-compose.yml +++ b/murmur/docker-compose.yml @@ -22,4 +22,3 @@ services: options: max-size: "${LOG_MAX_SIZE:-5m}" max-file: "${LOG_MAX_FILE:-5}" - # TODO: try to integrate with neilpang/acme.sh \ No newline at end of file -- 2.43.5 From 39714324d95e985e5e13323c0e97d4f7c7c4bca0 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 21 Sep 2024 02:42:14 +0300 Subject: [PATCH 3/6] transmission. Separating mount paths variables. Adding bind address variable. Renaming 'download' to 'downloads'. --- transmission/.env.dist | 6 +++++- transmission/docker-compose.yml | 4 ++-- transmission/{download => downloads}/.gitignore | 0 3 files changed, 7 insertions(+), 3 deletions(-) rename transmission/{download => downloads}/.gitignore (100%) diff --git a/transmission/.env.dist b/transmission/.env.dist index 6c6b0d2..c02f735 100644 --- a/transmission/.env.dist +++ b/transmission/.env.dist @@ -10,12 +10,16 @@ GROUP_ID=1000 #UMASK=022 P2P_PORT=6882 +#WEB_ADDRESS=127.0.0.1 WEB_PORT=9091 #NETWORK_MODE=host DIR_CONFIG=./config -DIR_DOWNLOAD=./download +DIR_DOWNLOAD_EXT=./downloads +DIR_DOWNLOAD_INT=/downloads +#DIR_TMP_DOWNLOAD_EXT=/path/to/unfinished/downloads +#IR_TMP_DOWNLOAD_INT=/downloads_tmp DIR_WATCH=./watch TIMEZONE=Europe/Moscow diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index 9f5a158..2e62e08 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -15,14 +15,14 @@ services: env_file: '.env' volumes: - '${DIR_CONFIG:-./config}:/config' - - '${DIR_DOWNLOAD:-./download}:/downloads' + - '${DIR_DOWNLOAD_EXT:-./downloads}:${DIR_DOWNLOAD_INT:-/downloads}' # Separate download cache directory in case you store unfinished torrents on SSD # Use with `"incomplete-dir-enabled": true` in the settings.json. This is `incomplete-dir` parameter. - '${DIR_TMP_DOWNLOAD:-/dev/null}:${DIR_TMP_DOWNLOAD:-/dev/null}' - '${DIR_WATCH:-./watch}:/watch' network_mode: '${NETWORK_MODE:-bridge}' ports: - - '${WEB_PORT:-9091}:${WEB_PORT:-9091}' + - '${WEB_ADDRESS:-0.0.0.0}:${WEB_PORT:-9091}:${WEB_PORT:-9091}' - '${P2P_PORT:-51413}:${P2P_PORT:-51413}' - '${P2P_PORT:-51413}:${P2P_PORT:-51413}/udp' restart: unless-stopped diff --git a/transmission/download/.gitignore b/transmission/downloads/.gitignore similarity index 100% rename from transmission/download/.gitignore rename to transmission/downloads/.gitignore -- 2.43.5 From 412a02ef02e04b93d2ee2e8faa4deb8228abf747 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 21 Sep 2024 02:44:23 +0300 Subject: [PATCH 4/6] transmission. Renaming path mapping variables for consistency. --- transmission/.env.dist | 4 ++-- transmission/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transmission/.env.dist b/transmission/.env.dist index c02f735..d34048e 100644 --- a/transmission/.env.dist +++ b/transmission/.env.dist @@ -15,12 +15,12 @@ WEB_PORT=9091 #NETWORK_MODE=host -DIR_CONFIG=./config +DIR_CONFIG_EXT=./config DIR_DOWNLOAD_EXT=./downloads DIR_DOWNLOAD_INT=/downloads #DIR_TMP_DOWNLOAD_EXT=/path/to/unfinished/downloads #IR_TMP_DOWNLOAD_INT=/downloads_tmp -DIR_WATCH=./watch +DIR_WATCH_EXT=./watch TIMEZONE=Europe/Moscow diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index 2e62e08..a64a167 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -14,12 +14,12 @@ services: #- HOST_WHITELIST= #optional env_file: '.env' volumes: - - '${DIR_CONFIG:-./config}:/config' + - '${DIR_CONFIG_EXT:-./config}:/config' - '${DIR_DOWNLOAD_EXT:-./downloads}:${DIR_DOWNLOAD_INT:-/downloads}' # Separate download cache directory in case you store unfinished torrents on SSD # Use with `"incomplete-dir-enabled": true` in the settings.json. This is `incomplete-dir` parameter. - '${DIR_TMP_DOWNLOAD:-/dev/null}:${DIR_TMP_DOWNLOAD:-/dev/null}' - - '${DIR_WATCH:-./watch}:/watch' + - '${DIR_WATCH_EXT:-./watch}:/watch' network_mode: '${NETWORK_MODE:-bridge}' ports: - '${WEB_ADDRESS:-0.0.0.0}:${WEB_PORT:-9091}:${WEB_PORT:-9091}' -- 2.43.5 From cf7d7b616bce823cec5e49d13783f96090d038c1 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 21 Sep 2024 02:47:04 +0300 Subject: [PATCH 5/6] transmission. Renaming path mapping variables for consistency. --- transmission/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml index a64a167..4984735 100644 --- a/transmission/docker-compose.yml +++ b/transmission/docker-compose.yml @@ -18,7 +18,7 @@ services: - '${DIR_DOWNLOAD_EXT:-./downloads}:${DIR_DOWNLOAD_INT:-/downloads}' # Separate download cache directory in case you store unfinished torrents on SSD # Use with `"incomplete-dir-enabled": true` in the settings.json. This is `incomplete-dir` parameter. - - '${DIR_TMP_DOWNLOAD:-/dev/null}:${DIR_TMP_DOWNLOAD:-/dev/null}' + - '${DIR_TMP_DOWNLOAD_EXT:-/dev/null}:${DIR_TMP_DOWNLOAD_INT:-/dev/null}' - '${DIR_WATCH_EXT:-./watch}:/watch' network_mode: '${NETWORK_MODE:-bridge}' ports: -- 2.43.5 From bfab73188452dd82f902c9df4ef85a532ffbb762 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 21 Sep 2024 03:24:24 +0300 Subject: [PATCH 6/6] transmission. Fixing variable name typo. --- transmission/.env.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transmission/.env.dist b/transmission/.env.dist index d34048e..d2d459e 100644 --- a/transmission/.env.dist +++ b/transmission/.env.dist @@ -19,7 +19,7 @@ DIR_CONFIG_EXT=./config DIR_DOWNLOAD_EXT=./downloads DIR_DOWNLOAD_INT=/downloads #DIR_TMP_DOWNLOAD_EXT=/path/to/unfinished/downloads -#IR_TMP_DOWNLOAD_INT=/downloads_tmp +#DIR_TMP_DOWNLOAD_INT=/downloads_tmp DIR_WATCH_EXT=./watch TIMEZONE=Europe/Moscow -- 2.43.5