From 26021dbcb9d33887e53d7579fd6d5855f8995fd0 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:07:26 -0700 Subject: [PATCH 01/10] youtubedl-material add --- nas.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nas.yml b/nas.yml index 9078d010..062a0f71 100644 --- a/nas.yml +++ b/nas.yml @@ -220,6 +220,10 @@ when: (lidarr_enabled | default(False)) tags: lidarr + - import_tasks: tasks/youtubedlmaterial.yml + when: (youtubedlmaterial_enabled | default(False)) + tags: youtubedlmaterial + - import_tasks: tasks/serposcope.yml when: (serposcope_enabled | default(False)) tags: serposcope From e39cc13b582fb3003d327b447672b3957962add2 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:10:07 -0700 Subject: [PATCH 02/10] youtubedl-material add --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 46d1ede6..d1b692a7 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ Ansible config and a bunch of Docker containers. * [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 +* [YouTubeDL-Material](https://ytdl-org.github.io/youtube-dl) - Self-hosted YouTube downloader built on Material Design * [ZNC](https://wiki.znc.in/ZNC) - IRC bouncer to stay connected to favourite IRC networks and channels ## What This Could Do From c6519c3108b17adfbdb51a8c1ac22251c8c8ca53 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:10:58 -0700 Subject: [PATCH 03/10] youtubedl-material 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..d5726c58 100644 --- a/templates/traefik/traefik.toml +++ b/templates/traefik/traefik.toml @@ -218,4 +218,5 @@ onDemand = false # create certificate when container is created "transmission-openvpn.{{ ansible_nas_domain }}", "ubooquity.{{ ansible_nas_domain }}", "wallabag.{{ ansible_nas_domain }}", + "youtubedlmaterial.{{ ansible_nas_domain }}", "znc.{{ ansible_nas_domain }}"] From dce666d087d371a2f820a34736cfcbe5c2a60592 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:12:39 -0700 Subject: [PATCH 04/10] youtubedl-material add --- tasks/youtubedlmaterial.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tasks/youtubedlmaterial.yml diff --git a/tasks/youtubedlmaterial.yml b/tasks/youtubedlmaterial.yml new file mode 100644 index 00000000..5c9e4498 --- /dev/null +++ b/tasks/youtubedlmaterial.yml @@ -0,0 +1,37 @@ + +--- +- name: YouTubeDL-Material Directory + file: + path: "{{ item }}" + state: directory + with_items: + - "{{ youtubedlmaterial_data_directory }}/appdata" + - "{{ youtubedlmaterial_data_directory }}/audio" + - "{{ youtubedlmaterial_data_directory }}/video" + - "{{ youtubedlmaterial_data_directory }}/subscriptions" + - "{{ youtubedlmaterial_dl_audio_directory }}" + - "{{ youtubedlmaterial_dl_video_directory }}" + - "{{ youtubedlmaterial_dl_subscriptions_directory }}" + +- name: YouTubeDL-Material Docker Container + docker_container: + name: youtubedlmaterial + image: tzahi12345/youtubedl-material:latest + pull: true + volumes: + - "{{ youtubedlmaterial_data_directory }}/appdata:/app/appdata:rw" + - "{{ youtubedlmaterial_dl_audio_directory }}:/app/audio:rw" + - "{{ youtubedlmaterial_dl_video_directory }}:/app/video:rw" + - "{{ youtubedlmaterial_dl_video_directory }}:/app/subscriptions:rw" + ports: + - "{{ youtubedlmaterial_port_http }}:17442" + env: + ALLOW_CONFIG_MUTATIONS: "true" + TZ: "{{ ansible_nas_timezone }}" + restart_policy: always + labels: + traefik.backend: "youtubedlmaterial" + traefik.frontend.rule: "Host:youtubedlmaterial.{{ ansible_nas_domain }}" + traefik.enable: "{{ youtubedlmaterial_available_externally }}" + traefik.port: "17442" + memory: 1g From a9e40ed0409526eb9a79b5fbb8c7add354785ebc Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:14:24 -0700 Subject: [PATCH 05/10] youtubedl-material add --- docs/configuration/application_ports.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md index ee55150e..03baabd6 100644 --- a/docs/configuration/application_ports.md +++ b/docs/configuration/application_ports.md @@ -59,4 +59,5 @@ By default, applications can be found on the ports listed below. | Ubooquity | 2202 | | | Ubooquity | 2203 | Admin | | Wallabag | 7780 | | +| YouTubeDL-Mater | 8998 | HTTP | | ZNC | 6677 | | From 3bce0b7f5c7c515ba1b63b7d61bd3a04289a0e6f Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:25:44 -0700 Subject: [PATCH 06/10] youtubedl-material add --- docs/applications/youtubedlmaterial.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docs/applications/youtubedlmaterial.md diff --git a/docs/applications/youtubedlmaterial.md b/docs/applications/youtubedlmaterial.md new file mode 100644 index 00000000..ca499a88 --- /dev/null +++ b/docs/applications/youtubedlmaterial.md @@ -0,0 +1,18 @@ + +# YouTubeDL-Material + +Homepage: [https://ytdl-org.github.io/youtube-dl/](https://ytdl-org.github.io/youtube-dl/) +Docker Container: [https://github.com/Tzahi12345/YoutubeDL-Material](https://github.com/Tzahi12345/YoutubeDL-Material) + +YoutubeDL-Material is a Material Design frontend for youtube-dl. It's coded using Angular 9 for the frontend, and Node.js on the backend. + +## Usage + +Set `youtubedlmaterial_enabled: true` in your `inventories//nas.yml` file. + +The YouTubeDL-Material web interface can be found at http://ansible_nas_host_or_ip:8998. + +## Specific Configuration + +A YouTube directory will be created in your configured downloads spot. YouTubeDL-Material downloads will be placed there. +You can change the download location via `inventories//nas.yml` file. From 8ee7bca5fbeba97d176293dcd49e50462f53604e Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Wed, 22 Apr 2020 23:27:45 -0700 Subject: [PATCH 07/10] youtubedl-material add --- group_vars/all.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index fe3e684a..07f7a27c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -38,6 +38,7 @@ emby_enabled: false bazarr_enabled: false ombi_enabled: false lidarr_enabled: false +youtubedlmaterial_enabled: false # Music airsonic_enabled: false @@ -492,6 +493,16 @@ lidarr_user_id: "0" lidarr_group_id: "0" lidarr_port: "8686" +### +### YoutTubedlmDL-Material +### +youtubedlmaterial_available_externally: "false" +youtubedlmaterial_data_directory: "{{ docker_home }}/youtubedlmaterial" +youtubedlmaterial_dl_audio_directory: "{{ downloads_root }}/YouTube/audio" +youtubedlmaterial_dl_video_directory: "{{ downloads_root }}/YouTube/video" +youtubedlmaterial_dl_subscriptions_directory: "{{ downloads_root }}/YouTube/subscriptions" +youtubedlmaterial_port_http: "8998" + ### ### Couchpotato ### @@ -823,4 +834,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 efa5a90a675297fb215c0ab7019df51fde369891 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Fri, 24 Apr 2020 16:32:24 -0700 Subject: [PATCH 08/10] change default dl location After some thought I prefer downloads to the complete/ folder --- group_vars/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 07f7a27c..57fe1a50 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -498,9 +498,9 @@ lidarr_port: "8686" ### youtubedlmaterial_available_externally: "false" youtubedlmaterial_data_directory: "{{ docker_home }}/youtubedlmaterial" -youtubedlmaterial_dl_audio_directory: "{{ downloads_root }}/YouTube/audio" -youtubedlmaterial_dl_video_directory: "{{ downloads_root }}/YouTube/video" -youtubedlmaterial_dl_subscriptions_directory: "{{ downloads_root }}/YouTube/subscriptions" +youtubedlmaterial_dl_audio_directory: "{{ downloads_root }}/complete/youtube/audio" +youtubedlmaterial_dl_video_directory: "{{ downloads_root }}/complete/youtube/video" +youtubedlmaterial_dl_subscriptions_directory: "{{ downloads_root }}/complete/youtube/subscriptions" youtubedlmaterial_port_http: "8998" ### From 9a80dd4fa232b5cf389ae18fc1629b9c00e1379e Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Mon, 4 May 2020 13:42:44 -0700 Subject: [PATCH 09/10] fix spelling error --- group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 57fe1a50..361f6c59 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -494,7 +494,7 @@ lidarr_group_id: "0" lidarr_port: "8686" ### -### YoutTubedlmDL-Material +### YouTubeDL-Material ### youtubedlmaterial_available_externally: "false" youtubedlmaterial_data_directory: "{{ docker_home }}/youtubedlmaterial" From 1ced6dbf6358b4f7acc079a41fdbf7c0dbadd8d8 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 9 May 2020 00:21:29 -0700 Subject: [PATCH 10/10] fix subscriptions variable use --- tasks/youtubedlmaterial.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/youtubedlmaterial.yml b/tasks/youtubedlmaterial.yml index 5c9e4498..a7ffdc5a 100644 --- a/tasks/youtubedlmaterial.yml +++ b/tasks/youtubedlmaterial.yml @@ -22,7 +22,7 @@ - "{{ youtubedlmaterial_data_directory }}/appdata:/app/appdata:rw" - "{{ youtubedlmaterial_dl_audio_directory }}:/app/audio:rw" - "{{ youtubedlmaterial_dl_video_directory }}:/app/video:rw" - - "{{ youtubedlmaterial_dl_video_directory }}:/app/subscriptions:rw" + - "{{ youtubedlmaterial_dl_subscriptions_directory }}:/app/subscriptions:rw" ports: - "{{ youtubedlmaterial_port_http }}:17442" env: