diff --git a/snackpot.yml b/snackpot.yml index efa3f6a..03e1a6f 100644 --- a/snackpot.yml +++ b/snackpot.yml @@ -8,11 +8,20 @@ nextcloud_hostname: nc.noodlefactory.co.uk nextcloud_base_dir: /var/www/html nextcloud_data_dir: /var/www/data + nextcloud_ext_dir: /var/www/ext nextcloud_db_user: nextcloud nextcloud_db: nextcloud letsencrypt_email: webmaster@noodlefactory.co.uk docker_compose_base_dir: /opt/docker-compose - + firewall_ports: + - "22" + - "80" + - "443" + # minidlna + - proto: udp + port: "1900" + - "8200" + tasks: - hostname: name: "{{ nextcloud_hostname }}" @@ -31,13 +40,13 @@ name: root_sudoers apply: { tags: root_sudoers } tags: root_sudoers - + - include_role: name: ufw apply: { tags: ufw } tags: ufw vars: - ufw_allow_in: ["22", "80", "443"] + ufw_allow: "{{ firewall_ports }}" - include_role: name: mrlesmithjr.netplan @@ -76,7 +85,7 @@ src: "docker-compose/{{ item.path }}" owner: root group: root - mode: 0440 + mode: 0660 backup: yes notify: restart docker compose services with_filetree: templates/docker-compose diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 715e4e4..3c53f08 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -12,6 +12,8 @@ volumes: vhost.d: html: redis: + minidlna_state: + minidlna_data: networks: proxy-tier: @@ -46,6 +48,7 @@ services: volumes: - nextcloud_src:{{ nextcloud_base_dir }} - nextcloud_data:{{ nextcloud_data_dir }} + - minidlna_data:{{ nextcloud_ext_dir }}/media - /srv:/srv links: - postgres @@ -113,3 +116,17 @@ services: - proxy env_file: - letsencrypt-companion.env + + minidlna: + image: vladgh/minidlna:0.5 + restart: always + volumes: + - minidlna_state:/minidlna + - minidlna_data:/media:ro + network_mode: host + environment: + - UPID=2000 + - UGID=2000 + - MINIDLNA_MEDIA_DIR_1=A,/media/audio + - MINIDLNA_MEDIA_DIR_2=V,/media/video + - MINIDLNA_FRIENDLY_NAME=Snackpot