testing

dev/host_vars/mediaserver.yml

@@ -5,12 +5,7 @@ allow_reboot: false
 manage_network: false
 
 users:
-  jellyfin:
+  - name: jellyfin
-    uid: 1001
-    gid: 1001
-    shell: /usr/sbin/nologin
-    home: false
-    system: true
 
 samba:
   users:

roles/base/handlers/main.yml

@@ -5,10 +5,6 @@
   listen: reboot_host
   when: allow_reboot
 
-- name: Reconfigure locales
-  ansible.builtin.command: dpkg-reconfigure -f noninteractive locales
-  listen: reconfigure_locales
-
 - name: Restart WireGuard
   ansible.builtin.service:
     name: wg-quick@wg0

roles/base/tasks/ansible.yml

@@ -2,4 +2,4 @@
   ansible.builtin.file:
     path: "~/.ansible/tmp"
     state: directory
-    mode: "700"
+    mode: 0700

roles/base/tasks/ddclient.yml

@@ -7,7 +7,7 @@
   ansible.builtin.template:
     src: ddclient.conf.j2
     dest: /etc/ddclient.conf
-    mode: "600"
+    mode: 0600
   register: ddclient_settings
 
 - name: Start ddclient and enable on boot

roles/base/tasks/firewall.yml

@@ -32,14 +32,14 @@
   ansible.builtin.template:
     src: fail2ban-ssh.conf.j2
     dest: /etc/fail2ban/jail.d/sshd.conf
-    mode: "640"
+    mode: 0640
   notify: restart_fail2ban
 
 - name: Install Fail2ban IP allow list
   ansible.builtin.template:
     src: fail2ban-allowlist.conf.j2
     dest: /etc/fail2ban/jail.d/allowlist.conf
-    mode: "640"
+    mode: 0640
   when: fail2ban_ignoreip is defined
   notify: restart_fail2ban
 

roles/base/tasks/mail.yml

@@ -11,10 +11,10 @@
   ansible.builtin.template:
     src: msmtprc.j2
     dest: /root/.msmtprc
-    mode: "600"
+    mode: 0600
 
 - name: Install /etc/aliases
   ansible.builtin.copy:
     dest: /etc/aliases
     content: "root: {{ mail.rootalias }}"
-    mode: "644"
+    mode: 0644

roles/base/tasks/network.yml

@@ -10,6 +10,6 @@
   ansible.builtin.template:
     src: "interface.j2"
     dest: "/etc/network/interfaces.d/{{ item.name }}"
-    mode: "400"
+    mode: 0400
   loop: "{{ interfaces }}"
   notify: reboot_host

roles/base/tasks/samba.yml

@@ -3,15 +3,23 @@
     name: samba
     state: present
 
+- name: Create nologin shell accounts for Samba
+  ansible.builtin.user:
+    name: "{{ item.name }}"
+    state: present
+    shell: /usr/sbin/nologin
+    createhome: false
+    system: yes
+  loop: "{{ samba.users }}"
+  when: item.manage_user is defined and item.manage_user is true
+
 - name: Create Samba users
-  ansible.builtin.command: "smbpasswd -a {{ item.name }}"
+  ansible.builtin.shell: "smbpasswd -a {{ item.name }}"
   args:
     stdin: "{{ item.password }}\n{{ item.password }}"
   loop: "{{ samba.users }}"
-  loop_control:
-    label: "{{ item.name }}"
   register: samba_users
-  changed_when: "'Added user' in samba_users.stdout"
+  changed_when: "'User added' in samba_users.stdout"
 
 - name: Ensure share directories exist
   ansible.builtin.file:
@@ -19,14 +27,13 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group }}"
     state: directory
-    mode: "755"
+    mode: 0755
   loop: "{{ samba.shares }}"
 
 - name: Configure Samba shares
   ansible.builtin.template:
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
-    mode: "700"
   notify: restart_samba
 
 - name: Start smbd and enable on boot

roles/base/tasks/system.yml

@@ -10,7 +10,7 @@
     state: present
 
 - name: Check for existing GPG keys
-  ansible.builtin.command: "gpg --list-keys {{ item.id }} 2>/dev/null"
+  command: "gpg --list-keys {{ item.id }} 2>/dev/null"
   register: gpg_check
   loop: "{{ root_gpgkeys }}"
   failed_when: false
@@ -18,22 +18,20 @@
   when: root_gpgkeys is defined
 
 - name: Import GPG keys
-  ansible.builtin.command:
+  command: "gpg --keyserver {{ item.item.server | default('keys.openpgp.org') }} --recv-key {{ item.item.id }}"
-    "gpg --keyserver {{ item.item.server | default('keys.openpgp.org') }} --recv-key {{ item.item.id }}"
   register: gpg_check_import
   loop: "{{ gpg_check.results }}"
   loop_control:
     label: "{{ item.item }}"
-  changed_when: false
   when: root_gpgkeys is defined and item.rc != 0
 
 - name: Check GPG key imports
-  ansible.builtin.fail:
+  fail:
     msg: "{{ item.stderr }}"
   loop: "{{ gpg_check_import.results }}"
   loop_control:
     label: "{{ item.item.item }}"
-  when: root_gpgkeys is defined and (not item.skipped | default(false)) and ('imported' not in item.stderr)
+  when: (item.skipped | default(false) == false) and ('imported' not in item.stderr)
 
 - name: Install NTPsec
   ansible.builtin.apt:
@@ -49,7 +47,7 @@
   community.general.locale_gen:
     name: "{{ locale_default }}"
     state: present
-  notify: reconfigure_locales
+  register: locale_gen_output
 
 - name: Set the default locale
   ansible.builtin.lineinfile:
@@ -57,11 +55,15 @@
     regexp: "^LANG="
     line: "LANG={{ locale_default }}"
 
+- name: Reconfigure locales
+  ansible.builtin.command: dpkg-reconfigure -f noninteractive locales
+  when: locale_gen_output.changed
+
 - name: Manage root authorized_keys
   ansible.builtin.template:
     src: authorized_keys.j2
     dest: /root/.ssh/authorized_keys
-    mode: "400"
+    mode: 0400
   when: authorized_keys is defined
 
 - name: Create system user groups
@@ -82,7 +84,6 @@
     group: "{{ item.value.gid }}"
     shell: "{{ item.value.shell | default('/bin/bash') }}"
     create_home: "{{ item.value.home | default(false) }}"
-    system: "{{ item.value.system | default(false) }}"
   loop: "{{ users | dict2items }}"
   loop_control:
     label: "{{ item.key }}"

roles/base/tasks/wireguard.yml

@@ -22,7 +22,7 @@
   ansible.builtin.template:
     src: wireguard.j2
     dest: /etc/wireguard/wg0.conf
-    mode: "400"
+    mode: 0400
   notify: restart_wireguard
 
 - name: Start WireGuard interface

roles/docker/tasks/main.yml

@@ -48,7 +48,7 @@
     repo: "{{ item.url }}"
     dest: "{{ docker_repos_path }}/{{ item.name }}"
     version: "{{ item.version }}"
-    accept_newhostkey: "{{ item.accept_newhostkey | default(false) }}"
+    accept_newhostkey: "{{ item.accept_newhostkey | default('false') }}"
     gpg_whitelist: "{{ item.trusted_keys | default([]) }}"
     verify_commit: "{{ true if (item.trusted_keys is defined and item.trusted_keys) else false }}"
     key_file: "{{ docker_repos_keys }}/id_{{ docker_repos_keytype }}"
@@ -86,7 +86,7 @@
     mode: 0400
   register: compose_env_update
   notify: compose_restart
-  no_log: "{{ docker_compose_env_nolog | default(true) }}"
+  no_log: "{{ docker_compose_env_nolog | default('true') }}"
   loop: "{{ docker_compose_deploy }}"
   loop_control:
     label: "{{ item.name }}"