From 34a9d5052255b077606fa463a28c93fe74ca4764 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:42:39 -0700 Subject: [PATCH 01/12] uTorrent add --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 46d1ede6..74cc3da4 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ Ansible config and a bunch of Docker containers. * [Traefik](https://traefik.io/) - Web proxy and SSL certificate manager * [Transmission](https://transmissionbt.com/) - BitTorrent client (with OpenVPN if you have a supported VPN provider) * [Ubooquity](http://vaemendis.net/ubooquity/) - Book and comic server +* [uTorrent](https://www.utorrent.com/) - The best torrent downloading app for beginners * [Virtual Desktop](https://github.com/RattyDAVE/docker-ubuntu-xrdp-mate-custom) - A virtual desktop running on your NAS. * [Wallabag](https://wallabag.org/) - Save and classify articles. Read them later. * [Watchtower](https://github.com/v2tec/watchtower) - Monitor your Docker containers and update them if a new version is available From 9f2f0753408a442a856db5710ac4a5da2054ebba Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:43:52 -0700 Subject: [PATCH 02/12] uTorrent add --- nas.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nas.yml b/nas.yml index 9078d010..ce6dd2b6 100644 --- a/nas.yml +++ b/nas.yml @@ -212,6 +212,10 @@ when: (ubooquity_enabled | default(False)) tags: ubooquity + - import_tasks: tasks/utorrent.yml + when: (utorrent_enabled | default(False)) + tags: utorrent + - import_tasks: tasks/ombi.yml when: (ombi_enabled | default(False)) tags: ombi From 0f3d7589156ffce01272ee3fd1f9e4bf0145b12a Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:44:32 -0700 Subject: [PATCH 03/12] uTorrent add --- templates/traefik/traefik.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/traefik/traefik.toml b/templates/traefik/traefik.toml index 98a9352d..d42cdacc 100644 --- a/templates/traefik/traefik.toml +++ b/templates/traefik/traefik.toml @@ -217,5 +217,6 @@ onDemand = false # create certificate when container is created "transmission.{{ ansible_nas_domain }}", "transmission-openvpn.{{ ansible_nas_domain }}", "ubooquity.{{ ansible_nas_domain }}", + "utorrent.{{ ansible_nas_domain }}", "wallabag.{{ ansible_nas_domain }}", "znc.{{ ansible_nas_domain }}"] From 6ce7c22e24b63d3a175a0f1aa1fce558984e6f8f Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:47:06 -0700 Subject: [PATCH 04/12] uTorrent add --- docs/configuration/application_ports.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md index ee55150e..9da7ba1e 100644 --- a/docs/configuration/application_ports.md +++ b/docs/configuration/application_ports.md @@ -58,5 +58,8 @@ By default, applications can be found on the ports listed below. | Transmission | 9092 | | | Ubooquity | 2202 | | | Ubooquity | 2203 | Admin | +| uTorrent | 8111 | HTTP | +| uTorrent | 6881 | BT | +| uTorrent | 6881 | UDP | | Wallabag | 7780 | | | ZNC | 6677 | | From 1794bb4c00c7b5a985cd8f24344434ef498efef9 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:53:29 -0700 Subject: [PATCH 05/12] uTorrent add --- group_vars/all.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index fe3e684a..6c6dd70b 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -20,6 +20,7 @@ transmission_with_openvpn_enabled: false # Please see docs about how to set VPN transmission_enabled: false nzbget_enabled: false pyload_enabled: false +utorrent_enabled: false # Media Serving plex_enabled: false @@ -368,6 +369,18 @@ openvpn_password: secretpassword openvpn_provider: AWESOMEVPNPROVIDER openvpn_config: United-Kingdom +### +### uTorrent +### +utorrent_available_externally: "false" +utorrent_config_directory: "{{ docker_home }}/utorrent/config" +utorrent_download_directory: "{{ downloads_root }}" +utorrent_port_http: "8111" +utorrent_port_bt_tcp: "6881" +utorrent_port_bt_udp: "6881" +utorrent_user_id: "999" +utorrent_group_id: "1001" + ### ### Joomla ### @@ -823,4 +836,4 @@ vd_users: - username: "{{ ansible_nas_user }}" password: "topsecret" sudo: "Y" -vd_rdp_port: 3389 \ No newline at end of file +vd_rdp_port: 3389 From 0d0ccc3b7c07ed86937168fbba81f64a3efeb594 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 22:55:47 -0700 Subject: [PATCH 06/12] uTorrent add --- tasks/utorrent.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tasks/utorrent.yml diff --git a/tasks/utorrent.yml b/tasks/utorrent.yml new file mode 100644 index 00000000..050e04c4 --- /dev/null +++ b/tasks/utorrent.yml @@ -0,0 +1,34 @@ + +--- +- name: Create uTorrent Directories + file: + path: "{{ item }}" + state: directory + with_items: + - "{{ utorrent_config_directory }}" + - "{{ utorrent_download_directory }}" + +- name: uTorrent Docker Container + docker_container: + name: utorrent + image: ekho/utorrent:latest + pull: true + volumes: + - "{{ utorrent_download_directory }}:/data:rw" + - "{{ utorrent_config_directory }}:/utorrent/settings:rw" + - "{{ torrents_root }}:/utorrent/torrents:rw" + ports: + - "{{ utorrent_port_http }}:8080" + - "{{ utorrent_port_bt_tcp }}:6881" + - "{{ utorrent_port_bt_udp }}:6881/udp" + env: + TZ: "{{ ansible_nas_timezone }}" + UID: "{{ utorrent_user_id }}" + GID: "{{ utorrent_group_id }}" + restart_policy: unless-stopped + memory: 1g + labels: + traefik.backend: "utorrent" + traefik.frontend.rule: "Host:utorrent.{{ ansible_nas_domain }}" + traefik.enable: "{{ utorrent_available_externally }}" + traefik.port: "8080" From 0bac6f2684aaae2be1d093ef1ceec4376229ea2c Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:00:40 -0700 Subject: [PATCH 07/12] uTorrent add --- docs/applications/utorrent.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docs/applications/utorrent.md diff --git a/docs/applications/utorrent.md b/docs/applications/utorrent.md new file mode 100644 index 00000000..823ba0d1 --- /dev/null +++ b/docs/applications/utorrent.md @@ -0,0 +1,14 @@ + +# uTorrent + +Homepage: [https://www.utorrent.com/](https://www.utorrent.com/) + +The best torrent downloading app for beginners + +## Usage + +Set `utorrent_enabled: true` in your `inventories//nas.yml` file. + +If you want to access uTorrent externally, don't forget to set `utorrent_available_externally: "true"` in your `inventories//nas.yml` file. + +The uTorrent web interface can be found at http://ansible_nas_host_or_ip:8111. From b0701eb3db9fd85f62fa502200e7ba0e9e4ac7d6 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Tue, 5 May 2020 15:02:07 -0700 Subject: [PATCH 08/12] no real need to specify the UDP port as it should be the same as the TCP port --- group_vars/all.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 6c6dd70b..e496d363 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -376,8 +376,7 @@ utorrent_available_externally: "false" utorrent_config_directory: "{{ docker_home }}/utorrent/config" utorrent_download_directory: "{{ downloads_root }}" utorrent_port_http: "8111" -utorrent_port_bt_tcp: "6881" -utorrent_port_bt_udp: "6881" +utorrent_port_bt: "6881" utorrent_user_id: "999" utorrent_group_id: "1001" From c9a274ba0ef72f52a2685f24164e2a6972d25ab2 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Tue, 5 May 2020 15:02:40 -0700 Subject: [PATCH 09/12] no real need to specify the UDP port as it should be the same as the TCP port --- tasks/utorrent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/utorrent.yml b/tasks/utorrent.yml index 050e04c4..5d410f82 100644 --- a/tasks/utorrent.yml +++ b/tasks/utorrent.yml @@ -19,8 +19,8 @@ - "{{ torrents_root }}:/utorrent/torrents:rw" ports: - "{{ utorrent_port_http }}:8080" - - "{{ utorrent_port_bt_tcp }}:6881" - - "{{ utorrent_port_bt_udp }}:6881/udp" + - "{{ utorrent_port_bt }}:6881" + - "{{ utorrent_port_bt }}:6881/udp" env: TZ: "{{ ansible_nas_timezone }}" UID: "{{ utorrent_user_id }}" From 67363a9d6751232fa9493e66df5a2d752a1492b7 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 9 May 2020 21:05:25 -0700 Subject: [PATCH 10/12] add Docker homepage --- docs/applications/utorrent.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/applications/utorrent.md b/docs/applications/utorrent.md index 823ba0d1..9250f766 100644 --- a/docs/applications/utorrent.md +++ b/docs/applications/utorrent.md @@ -2,6 +2,7 @@ # uTorrent Homepage: [https://www.utorrent.com/](https://www.utorrent.com/) +Docker Homepage: [https://hub.docker.com/r/ekho/utorrent](https://hub.docker.com/r/ekho/utorrent) The best torrent downloading app for beginners From fc855cd7860b78ba40de8568d7f87c533e41bfcf Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 9 May 2020 21:06:29 -0700 Subject: [PATCH 11/12] homepage -> container --- docs/applications/utorrent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/applications/utorrent.md b/docs/applications/utorrent.md index 9250f766..d415e5f5 100644 --- a/docs/applications/utorrent.md +++ b/docs/applications/utorrent.md @@ -2,7 +2,7 @@ # uTorrent Homepage: [https://www.utorrent.com/](https://www.utorrent.com/) -Docker Homepage: [https://hub.docker.com/r/ekho/utorrent](https://hub.docker.com/r/ekho/utorrent) +Docker Container: [https://hub.docker.com/r/ekho/utorrent](https://hub.docker.com/r/ekho/utorrent) The best torrent downloading app for beginners From 3ed24bbde7de66b571de96c884486c398b676a2c Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sun, 10 May 2020 17:32:51 -0700 Subject: [PATCH 12/12] Changed GUID/PUID to root to match Transmission defaults --- group_vars/all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index e496d363..bd272bc4 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -377,8 +377,8 @@ utorrent_config_directory: "{{ docker_home }}/utorrent/config" utorrent_download_directory: "{{ downloads_root }}" utorrent_port_http: "8111" utorrent_port_bt: "6881" -utorrent_user_id: "999" -utorrent_group_id: "1001" +utorrent_user_id: "0" +utorrent_group_id: "0" ### ### Joomla