From d86b67c32863db6f97b4bc95cfb90f5401370ea7 Mon Sep 17 00:00:00 2001 From: Andrew Burrows Date: Fri, 1 Mar 2019 20:54:16 +0000 Subject: [PATCH 1/3] Change networking for emby container to host This allows devices such as smart TVs to find and stream from emby --- tasks/emby.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/emby.yml b/tasks/emby.yml index aed24b47..6e73ad12 100644 --- a/tasks/emby.yml +++ b/tasks/emby.yml @@ -17,6 +17,7 @@ ports: - "8096:8096" # HTTP port - "8920:8920" # HTTPS port + network_mode: host env: TZ: "{{ ansible_nas_timezone }}" PUID: "{{ emby_user_id }}" From 3a5821cd3c37cb81f1189335b99a2c0ed7453d59 Mon Sep 17 00:00:00 2001 From: Andrew Burrows Date: Fri, 1 Mar 2019 20:59:43 +0000 Subject: [PATCH 2/3] Add get_iplayer --- README.md | 1 + docs/applications/get_iplayer.md | 11 +++++++++++ docs/configuration/application_ports.md | 1 + group_vars/all.yml.dist | 7 +++++++ nas.yml | 6 +++++- tasks/get_iplayer.yml | 21 +++++++++++++++++++++ tests/test.yml | 7 +++++++ 7 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 docs/applications/get_iplayer.md create mode 100644 tasks/get_iplayer.yml diff --git a/README.md b/README.md index a1e6b79e..acaefae9 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ just a stock Ubuntu install, some clever Ansible config and a bunch of Docker co * [CouchPotato](https://couchpota.to/) - for downloading and managing movies * [Duplicati](https://www.duplicati.com/) - for backing up your stuff * [Emby](https://emby.media/) - Media streaming and management +* [get_iplayer](https://github.com/get-iplayer/get_iplayer) - download programmes from BBC iplayer * [Gitea](https://gitea.io/en-us/) - Self-hosted Github clone * [Glances](https://nicolargo.github.io/glances/) - for seeing the state of your system via a web browser * [Grafana](https://github.com/grafana/grafana) - Dashboarding tool diff --git a/docs/applications/get_iplayer.md b/docs/applications/get_iplayer.md new file mode 100644 index 00000000..b5825475 --- /dev/null +++ b/docs/applications/get_iplayer.md @@ -0,0 +1,11 @@ +# get_iplayer + +Homepage: [https://github.com/get-iplayer/get_iplayer](https://github.com/get-iplayer/get_iplayer) + +Downloads TV and radio programmes from BBC iPlayer. + +## Usage + +Set `get_iplayer_enabled: true` in your `group_vars/all.yml` file. + +The get_iplayer web interface can be found at http://ansible_nas_host_or_ip:8182. diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md index 9818386e..d27730c7 100644 --- a/docs/configuration/application_ports.md +++ b/docs/configuration/application_ports.md @@ -8,6 +8,7 @@ By default, applications can be found on the ports listed below. | Duplicati | 8200 | | | Emby | 8096 | HTTP | | Emby | 8920 | HTTPS | +| get_iplayer | 8182 | | | Gitea | 3001 | Web | | Gitea | 222 | SSH | | Glances | 61208 | SSH | diff --git a/group_vars/all.yml.dist b/group_vars/all.yml.dist index 781aed14..27f12d1c 100644 --- a/group_vars/all.yml.dist +++ b/group_vars/all.yml.dist @@ -27,6 +27,7 @@ sonarr_enabled: false sickrage_enabled: false couchpotato_enabled: false radarr_enabled: false +get_iplayer_enabled: false # Music airsonic_enabled: false @@ -419,3 +420,9 @@ timemachine_volume_size_limit: 0 timemachine_password: timemachine timemachine_share_name: TimeMachine timemachine_log_level: error + +### +### get_iplayer +### +get_iplayer_config_directory: "{{ docker_home }}/get_iplayer" +get_iplayer_download_directory: "{{ tv_root }}/iplayer_downloads" diff --git a/nas.yml b/nas.yml index 5043a79d..ef70b8fd 100644 --- a/nas.yml +++ b/nas.yml @@ -121,4 +121,8 @@ - import_tasks: tasks/cloudflare_ddns.yml when: cloudflare_ddns_enabled - tags: cloudflare_ddns \ No newline at end of file + tags: cloudflare_ddns + + - import_tasks: tasks/get_iplayer.yml + when: get_iplayer_enabled + tags: get_iplayer \ No newline at end of file diff --git a/tasks/get_iplayer.yml b/tasks/get_iplayer.yml new file mode 100644 index 00000000..85a4ec68 --- /dev/null +++ b/tasks/get_iplayer.yml @@ -0,0 +1,21 @@ +- name: Create get_iplayer Directories + file: + path: "{{ item }}" + state: directory + with_items: + - "{{ get_iplayer_config_directory }}" + - "{{ get_iplayer_download_directory }}" + +- name: get_iplayer Docker Container + docker_container: + name: get_iplayer + image: kolonuk/get_iplayer + pull: true + volumes: + - "{{ get_iplayer_config_directory }}:/root/.get_iplayer:rw" + - "{{ get_iplayer_download_directory }}:/root/output:rw" + ports: + - "8182:8181" + restart_policy: unless-stopped + memory: 1g + diff --git a/tests/test.yml b/tests/test.yml index ad864ed6..6abd11a3 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -27,6 +27,7 @@ sonarr_enabled: false sickrage_enabled: false couchpotato_enabled: false radarr_enabled: false +get_iplayer_enabled: false # Music airsonic_enabled: false @@ -419,3 +420,9 @@ timemachine_volume_size_limit: 0 timemachine_password: timemachine timemachine_share_name: TimeMachine timemachine_log_level: error + +### +### get_iplayer +### +get_iplayer_config_directory: "{{ docker_home }}/get_iplayer" +get_iplayer_download_directory: "{{ tv_root }}/iplayer_downloads" From 7fa211d5dd36bb445cdd2d933f5c9ebfd91323df Mon Sep 17 00:00:00 2001 From: David Stephens Date: Sat, 9 Mar 2019 22:31:42 +0000 Subject: [PATCH 3/3] Issue template to get more environment details --- .github/ISSUE_TEMPLATE.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index dfba848a..92ded7c7 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -9,9 +9,12 @@ Enter a couple of lines about the issue. **Environment** - Ansible-NAS revision (`git rev-parse --short HEAD`): - Ansible version (paste the entire output of `ansible --version` on the machine you run the playbook from): -- Ansible-NAS operating system (`uname -a` on the Ansible-NAS box): +- Ansible-NAS operating system (`cat /etc/lsb-release` on the Ansible-NAS box) - _If this is anything other than Ubuntu 18.04 help will be limited_: +- Ansible-NAS kernel (`cat /etc/lsb-release` on the Ansible-NAS box): - Ansible-NAS Python version (`python --version` on the Ansible-NAS box): +- Ansible-NAS Docker version (`docker --version` on the Ansible-NAS box): - Vagrant version, if testing (`vagrant --version`) +- Are you running the playbook from a remote box or the Ansible-NAS box itself? **Expected behavior**