Merge branch 'master' into samba-timemachine

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,16 +1,22 @@
-For :bug: bug reports, please fill out the information below plus any additional relevant information. For feature requests, feel free to clear the form.
+---
+name: Bug Report
+about: Help us to improve Ansible-NAS
+title: ''
+labels: bug
+assignees: ''
+
+---
 
 If you're reporting an issue with execution of the Ansible-NAS playbook, please run the playbook with `-vvv`, and ideally isolate the problematic part with `--tags <ansible tag>` where possible.
 
-**Short problem description**
-
-Enter a couple of lines about the issue.
+**Describe the bug**
+A clear and concise description of what the bug is.
 
 **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 (`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 kernel (`uname -a` 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):
 - Latest Docker logs (`journalctl -u docker.service` on the Ansible-NAS box):
@@ -18,17 +24,16 @@ Enter a couple of lines about the issue.
 - Vagrant version, if testing (`vagrant --version`)
 
 **Expected behavior**
-
 What should happen?
 
 **Actual behavior**
-
 What actually happens?
 
 **Steps to reproduce**
-
 What does someone need to do to reproduce this?
 
 **Playbook Output**
+Paste the output of the playbook at the problematic point. Surround it in triple backticks so that it's formatted correctly.
 
-Paste the output of the playbook at the problematic point.
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

group_vars/all.yml.dist

@@ -251,6 +251,7 @@ ansible_nas_extra_packages:
   - bonnie++
   - unzip
   - lm-sensors
+  - ctop
 
 ansible_python_interpreter: /usr/bin/python3
 
@@ -318,6 +319,8 @@ plex_movies_directory: "{{ movies_root }}"
 plex_movies_permissions: "rw"
 plex_tv_directory: "{{ tv_root }}"
 plex_tv_permissions: "rw"
+plex_music_directory: "{{ music_root }}"
+plex_music_permissions: "rw"
 plex_user_id: 0
 plex_group_id: 0
 

tasks/bitwarden.yml

@@ -21,7 +21,6 @@
       LOG_FILE: "/data/bitwarden.log"
       WEBSOCKET_ENABLED: "true"
     labels:
-      traefik.backend: "bitwarden"
       traefik.web.frontend.rule: "Host:bitwarden.{{ ansible_nas_domain }}"
       traefik.enable: "{{ bitwarden_available_externally }}"
       traefik.web.port: "80"
@@ -38,4 +37,4 @@
     pull: true
     restart_policy: unless-stopped
     volumes_from: bitwarden
-    memory: 1g
+    memory: 1g

tasks/firefly.yml

@@ -40,12 +40,12 @@
     ports:
       - "8066:80"
     env:
-      FF_APP_ENV: "local"
-      FF_APP_KEY: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
-      FF_DB_HOST: "db"
-      FF_DB_NAME: "firefly"
-      FF_DB_USER: "firefly"
-      FF_DB_PASSWORD: "firefly"
+      APP_ENV: "local"
+      APP_KEY: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
+      DB_HOST: "db"
+      DB_DATABASE: "firefly"
+      DB_USERNAME: "firefly"
+      DB_PASSWORD: "firefly"
       TZ: "{{ ansible_nas_timezone }}"
     restart_policy: unless-stopped
     memory: 1g

tasks/plex.yml

@@ -15,6 +15,7 @@
       - "{{ plex_config_directory }}:/config:rw"
       - "{{ plex_movies_directory }}:/movies:{{ plex_movies_permissions }}"
       - "{{ plex_tv_directory }}:/tv:{{ plex_tv_permissions }}"
+      - "{{ plex_music_directory }}:/music:{{ plex_music_permissions }}"
     network_mode: "host"
     env:
       TZ: "{{ ansible_nas_timezone }}"

tasks/users.yml

@@ -11,4 +11,5 @@
     system: yes
     update_password: on_create
     create_home: no
-    group: ansible-nas
+    group: ansible-nas
+    shell: /usr/sbin/nologin