Merge branch 'master' into feature/minidnla

.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**
 

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

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.

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       |

group_vars/all.yml.dist

@@ -30,6 +30,7 @@ sonarr_enabled: false
 sickrage_enabled: false
 couchpotato_enabled: false
 radarr_enabled: false
+get_iplayer_enabled: false
 
 # Music
 airsonic_enabled: false
@@ -429,3 +430,9 @@ timemachine_log_level: error
 minidlna_media_directory1: "{{ movies_root }}"
 minidlna_media_directory2: "{{ tv_root }}"
 minidlna_friendly_name: "{{ ansible_nas_hostname }}"
+
+###
+### get_iplayer
+###
+get_iplayer_config_directory: "{{ docker_home }}/get_iplayer"
+get_iplayer_download_directory: "{{ tv_root }}/iplayer_downloads"

nas.yml

@@ -126,3 +126,7 @@
   - import_tasks: tasks/minidlna.yml
     when: minidlna_enabled
     tags: minidlna
+    
+  - import_tasks: tasks/get_iplayer.yml
+    when: get_iplayer_enabled
+    tags: get_iplayer

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 }}"

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
+

tests/test.yml

@@ -30,6 +30,7 @@ sonarr_enabled: false
 sickrage_enabled: false
 couchpotato_enabled: false
 radarr_enabled: false
+get_iplayer_enabled: false
 
 # Music
 airsonic_enabled: false
@@ -429,3 +430,9 @@ timemachine_log_level: error
 minidlna_media_directory1: "{{ movies_root }}"
 minidlna_media_directory2: "{{ tv_root }}"
 minidlna_friendly_name: "{{ ansible_nas_hostname }}"
+
+###
+### get_iplayer
+###
+get_iplayer_config_directory: "{{ docker_home }}/get_iplayer"
+get_iplayer_download_directory: "{{ tv_root }}/iplayer_downloads"