Merge branch 'dev' into master

This commit is contained in:
jandrews377
2018-01-02 08:46:33 +13:00
committed by GitHub
10540 changed files with 573798 additions and 365039 deletions

View File

@@ -20,7 +20,7 @@ services:
- OPENVPN_PROVIDER=PIA
- OPENVPN_USERNAME=username
- OPENVPN_PASSWORD=password
- OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
- OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60
- LOCAL_NETWORK=192.168.0.0/24
proxy:
image: haugene/transmission-openvpn-proxy
@@ -30,3 +30,10 @@ services:
- 8080:8080
volumes:
- /etc/localtime:/etc/localtime:ro
rss:
image: haugene/transmission-rss
links:
- transmission
environment:
- RSS_URL=http://.../xxxxx.rss