Skip to content

Commit f1c47fc

Browse files
SimpleHomelabSimpleHomelab
committed
* Several updates 2023_03_02. See full commit log.
* Converted by Synology M2 drives from cache device to a volume for docker. Significantly faster docker performance. Consequently few minor changes to paths (volume1 to volume3) * Updated traefik app yml for Home Assistant OS. * Replaced Transmission (with built in VPN killswitch) with Gluetun and Surfshark Wireguard VPN (https://bit.ly/shb-surfshark). * Replaced Transmission with qBittorrent (which I prefer) via Glueten VPN. * Added a whoami container on home server for testing purposes. * Replaced Dashy with Homepage. * Added deunhealth so qBittorrent heals after VPN disconnects/restarts * Updated docker and docker compose versions
1 parent c7ad75f commit f1c47fc

File tree

7 files changed

+205
-136
lines changed

7 files changed

+205
-136
lines changed

‎appdata/traefik2/rules/cloudserver/app-haos-no-auth.yml.example‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
http:
2+
routers:
3+
haos-rtr:
4+
rule: "Host(`haos.{{env "DOMAINNAME_CLOUD_SERVER"}}`)"
5+
entryPoints:
6+
- https
7+
middlewares:
8+
- chain-no-auth
9+
service: haos-svc
10+
tls:
11+
certResolver: dns-cloudflare
12+
services:
13+
haos-svc:
14+
loadBalancer:
15+
servers:
16+
- url: "http://192.168.1.123:8123" # or whatever your external host's IP:port is

‎appdata/traefik2/rules/cloudserver/app-hassos-no-auth.yml.example‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docker-compose-t2-obsolete.yml‎

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2041,4 +2041,100 @@ services:
20412041
- "traefik.http.routers.heimdall-rtr.middlewares=chain-oauth@file"
20422042
## HTTP Services
20432043
- "traefik.http.routers.heimdall-rtr.service=heimdall-svc"
2044-
- "traefik.http.services.heimdall-svc.loadbalancer.server.port=80"
2044+
- "traefik.http.services.heimdall-svc.loadbalancer.server.port=80"
2045+
2046+
# Dashy - Application Dashboard
2047+
dashy:
2048+
<<: *common-keys-apps # See EXTENSION FIELDS at the top
2049+
container_name: dashy
2050+
image: lissy93/dashy
2051+
healthcheck:
2052+
test: ['CMD', 'node', '/app/services/healthcheck']
2053+
interval: 1m30s
2054+
timeout: 10s
2055+
retries: 3
2056+
start_period: 40s
2057+
ports:
2058+
- 4000:80
2059+
volumes:
2060+
- $DOCKERDIR/appdata/dashy/conf.yml:/app/public/conf.yml
2061+
- $DOCKERDIR/appdata/dashy:/app/public/item-icons
2062+
environment:
2063+
- NODE_ENV=production
2064+
- UID=$PUID
2065+
- GID=$PGID
2066+
labels:
2067+
- "traefik.enable=true"
2068+
## HTTP Routers
2069+
- "traefik.http.routers.dashy-rtr.entrypoints=https"
2070+
- "traefik.http.routers.dashy-rtr.rule=Host(`$DOMAINNAME_HOME_SYNOLOGY`,`www.$DOMAINNAME_HOME_SYNOLOGY`)"
2071+
## Middlewares
2072+
- "traefik.http.routers.dashy-rtr.middlewares=chain-oauth@file"
2073+
## HTTP Services
2074+
- "traefik.http.routers.dashy-rtr.service=dashy-svc"
2075+
- "traefik.http.services.dashy-svc.loadbalancer.server.port=80"
2076+
2077+
# TransmissionBT - Torrent Downloader
2078+
# ONLY ACCESSIBLE THROUGH https://domain.com/transmission/web/ if using PathPrefix
2079+
# For Proxmox LXC Containers - https://pve.proxmox.com/wiki/OpenVPN_in_LXC
2080+
transmission-vpn:
2081+
image: haugene/transmission-openvpn:latest
2082+
container_name: transmission-vpn
2083+
restart: unless-stopped
2084+
networks:
2085+
t2_proxy:
2086+
ipv4_address: 192.168.90.169
2087+
# ports:
2088+
# - "$TRANSMISSION_PORT:9091" if vpn is enabled you cannot access transmission using host ip
2089+
cap_add:
2090+
- NET_ADMIN
2091+
devices:
2092+
- /dev/net/tun
2093+
# dns:
2094+
# - 1.1.1.1
2095+
# - 1.0.0.1
2096+
volumes:
2097+
- /etc/localtime:/etc/localtime:ro
2098+
- $DOCKERDIR/appdata/transmission-vpn/data:/data
2099+
- $DOCKERDIR/appdata/transmission-vpn/config:/config
2100+
- $EXTDRIVE/downloads:/data/downloads
2101+
environment:
2102+
<<: *default-tz-puid-pgid
2103+
OPENVPN_PROVIDER: FASTESTVPN
2104+
OPENVPN_USERNAME: $FASTESTVPN_USERNAME
2105+
OPENVPN_PASSWORD: $FASTESTVPN_PASSWORD
2106+
#OPENVPN_CONFIG: "Switzerland-UDP"
2107+
#OPENVPN_OPTS: --inactive 3600 --ping 10 --ping-exit 60
2108+
LOCAL_NETWORK: "$LOCAL_NETWORK"
2109+
UMASK_SET: 2
2110+
# These transmission settings are not needed as /data/transmission-home/settings.json is persistent
2111+
TRANSMISSION_RPC_AUTHENTICATION_REQUIRED: "true"
2112+
TRANSMISSION_RPC_HOST_WHITELIST: "127.0.0.1,$SERVER_IP"
2113+
TRANSMISSION_RPC_PASSWORD: $TRANSMISSION_RPC_PASSWORD
2114+
TRANSMISSION_RPC_USERNAME: $TRANSMISSION_RPC_USERNAME
2115+
TRANSMISSION_UMASK: 002
2116+
TRANSMISSION_RATIO_LIMIT: 1.0
2117+
TRANSMISSION_RATIO_LIMIT_ENABLED: "true"
2118+
TRANSMISSION_ALT_SPEED_DOWN: 2000
2119+
TRANSMISSION_ALT_SPEED_ENABLED: "false"
2120+
TRANSMISSION_ALT_SPEED_UP: 100
2121+
TRANSMISSION_SPEED_LIMIT_DOWN: 10000
2122+
TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED: "true"
2123+
TRANSMISSION_SPEED_LIMIT_UP: 500
2124+
TRANSMISSION_SPEED_LIMIT_UP_ENABLED: "true"
2125+
TRANSMISSION_INCOMPLETE_DIR: /data/downloads/torrents/incomplete
2126+
TRANSMISSION_INCOMPLETE_DIR_ENABLED: "true"
2127+
TRANSMISSION_WATCH_DIR: /data/downloads/torrents
2128+
TRANSMISSION_WATCH_DIR_ENABLED: "true"
2129+
TRANSMISSION_DOWNLOAD_DIR: /data/downloads/torrents
2130+
LOG_TO_STDOUT: "true"
2131+
labels:
2132+
- "traefik.enable=true"
2133+
## HTTP Routers
2134+
- "traefik.http.routers.transmission-vpn-rtr.entrypoints=https"
2135+
- "traefik.http.routers.transmission-vpn-rtr.rule=Host(`trans.$DOMAINNAME_CLOUD_SERVER`)"
2136+
## Middlewares
2137+
- "traefik.http.routers.transmission-vpn-rtr.middlewares=middlewares-rate-limit@file"
2138+
## HTTP Services
2139+
- "traefik.http.routers.transmission-vpn-rtr.service=transmission-vpn-svc"
2140+
- "traefik.http.services.transmission-vpn-svc.loadbalancer.server.port=9091"

‎docker-compose-t2-synology.yml‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version: "3.9"
1313
# Google Drive mounted using Rclone Docker Container for media
1414

1515
# Docker: 20.10.3
16-
# Docker Compose: 2.10.2
16+
# Docker Compose: 2.15.1
1717

1818
########################### NETWORKS
1919
# There is no need to create any networks outside this docker-compose file.
@@ -361,37 +361,6 @@ services:
361361
- "traefik.http.routers.autoindex-rtr.service=autoindex-svc"
362362
- "traefik.http.services.autoindex-svc.loadbalancer.server.port=80"
363363

364-
# Dashy - Application Dashboard
365-
dashy:
366-
<<: *common-keys-apps # See EXTENSION FIELDS at the top
367-
container_name: dashy
368-
image: lissy93/dashy
369-
healthcheck:
370-
test: ['CMD', 'node', '/app/services/healthcheck']
371-
interval: 1m30s
372-
timeout: 10s
373-
retries: 3
374-
start_period: 40s
375-
ports:
376-
- 4000:80
377-
volumes:
378-
- $DOCKERDIR/appdata/dashy/conf.yml:/app/public/conf.yml
379-
- $DOCKERDIR/appdata/dashy:/app/public/item-icons
380-
environment:
381-
- NODE_ENV=production
382-
- UID=$PUID
383-
- GID=$PGID
384-
labels:
385-
- "traefik.enable=true"
386-
## HTTP Routers
387-
- "traefik.http.routers.dashy-rtr.entrypoints=https"
388-
- "traefik.http.routers.dashy-rtr.rule=Host(`$DOMAINNAME_HOME_SYNOLOGY`,`www.$DOMAINNAME_HOME_SYNOLOGY`)"
389-
## Middlewares
390-
- "traefik.http.routers.dashy-rtr.middlewares=chain-oauth@file"
391-
## HTTP Services
392-
- "traefik.http.routers.dashy-rtr.service=dashy-svc"
393-
- "traefik.http.services.dashy-svc.loadbalancer.server.port=80"
394-
395364
# ZeroTier-One - Private Network over Internet
396365
zerotier:
397366
image: zerotier/zerotier-synology:latest
@@ -509,9 +478,9 @@ services:
509478
- no-new-privileges:true
510479
environment:
511480
INITIAL_RUN: "true"
512-
DRY_RUN: 0
481+
#DRY_RUN: 0
513482
CRON_SCHEDULE: "*/30 * * * *"
514-
SECTION_MAPS: $HOME_PLEX/$HOME_PLEX_MOVIESH $CLOUD_PLEX/$CLOUD_PLEX_MOVIESH | $HOME_PLEX/$HOME_PLEX_SHOWST $CLOUD_PLEX/$CLOUD_PLEX_SHOWST | $HOME_PLEX/$HOME_PLEX_MOVIESI $CLOUD_PLEX/$CLOUD_PLEX_MOVIESI | $HOME_PLEX/$HOME_PLEX_MOVIEST $CLOUD_PLEX/$CLOUD_PLEX_MOVIEST | $HOME_PLEX/$HOME_PLEX_MOVIESK $CLOUD_PLEX/$CLOUD_PLEX_MOVIESK | $HOME_PLEX/$HOME_PLEX_SHOWSK $CLOUD_PLEX/$CLOUD_PLEX_SHOWSK
483+
SECTION_MAPS: $CLOUD_PLEX/$CLOUD_PLEX_SHOWST $HOME_PLEX/$HOME_PLEX_SHOWST | $CLOUD_PLEX/$CLOUD_PLEX_MOVIESK $HOME_PLEX/$HOME_PLEX_MOVIESK | $CLOUD_PLEX/$CLOUD_PLEX_SHOWSK $HOME_PLEX/$HOME_PLEX_SHOWSK
515484
restart: unless-stopped
516485

517486
############################# MEDIA FILE MANAGEMENT
@@ -762,7 +731,8 @@ services:
762731
- "22000:22000/udp"
763732
- "21027:21027/udp"
764733
volumes:
765-
- /volume1:/data
734+
- /volume1:/data/volume1
735+
- /volume3:/data/volume3
766736
- $DOCKERDIR/appdata/syncthing:/config
767737
environment:
768738
<<: *default-tz-puid-pgid

‎docker-compose-t2-web.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ version: "3.9"
1010
# Digital Ocean: 1 vCPU, 2 GB RAM, and 50 GB NVME
1111
# Use this Referral Link and get $100 Credit: https://m.do.co/c/5ae8e2c8f34b
1212

13-
# Docker: 20.10.21
14-
# Docker Compose: v2.12.2 (docker-compose-plugin for Docker)
13+
# Docker: 23.0.1
14+
# Docker Compose: v2.16.0 (docker-compose-plugin for Docker)
1515

1616
########################### NETWORKS
1717
# There is no need to create any networks outside this docker-compose file.
@@ -605,7 +605,7 @@ services:
605605
- WG_DEFAULT_ADDRESS=192.168.20.x
606606
- WG_DEFAULT_DNS=1.1.1.1
607607
# - WG_MTU=1420
608-
- WG_ALLOWED_IPS=0.0.0.0/0, ::/0
608+
- WG_ALLOWED_IPS=0.0.0.0/0
609609
# - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt
610610
# - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt
611611
# - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt

0 commit comments

Comments
 (0)