Sudoers config and hostname config working

inventory/host_vars/dl01.balsillie.house/network.yml

@@ -0,0 +1,3 @@
+# code: language=ansible
+
+ipv4_only: true

playbooks/archlinux-servers.yml

@@ -1,4 +1,4 @@
----
+# code: language=ansible
 
 - name: Configure ssh and firewall
   hosts:
@@ -7,10 +7,17 @@
   become: true
   pre_tasks:
 
-    - name: Set IP facts
+    - name: Set IPv4 facts
       become: false
       ansible.builtin.set_fact:
         ipv4_address: "{{ query('community.dns.lookup', inventory_hostname, type='A', nxdomain_handling='fail') | first }}"
+
+
+    - name: Set IPv6 facts
+      become: false
+      when:
+        - not (ipv4_only | default(false))
+      ansible.builtin.set_fact:
         ipv6_address: "{{ query('community.dns.lookup', inventory_hostname, type='AAAA', nxdomain_handling='fail') | first }}"
 
     - name: Install basic utilities
@@ -22,4 +29,6 @@
         update_cache: true
 
   roles:
-    - sshd
+    # - hostname
+    - sudoers
+    # - sshd

roles/hostname/tasks/main.yml

@@ -0,0 +1,23 @@
+# code: language=ansible
+
+- name: Add IPv4 address to /etc/hosts
+  ansible.builtin.lineinfile:
+    path: /etc/hosts
+    line: "{{ ipv4_address }} {{ inventory_hostname }} {{ inventory_hostname_short }}"
+
+- name: Ensure IPv4 loopback exists in /etc/hosts
+  ansible.builtin.lineinfile:
+    path: /etc/hosts
+    line: "127.0.1.1 {{ inventory_hostname }} {{ inventory_hostname_short }}"
+
+- name: Add IPv6 address to /etc/hosts
+  when:
+    - not (ipv4_only | default(false))
+  ansible.builtin.lineinfile:
+    path: /etc/hosts
+    line: "{{ ipv6_address }} {{ inventory_hostname }} {{ inventory_hostname_short }}"
+
+- name: Set hostname
+  ansible.builtin.hostname:
+    name: "{{ inventory_hostname }}"
+    use: systemd

roles/hostname/vars/main.yml

@@ -0,0 +1 @@
+# code: language=ansible

roles/sshd/tasks/main.yml

@@ -26,7 +26,7 @@
       [Link]
       ActivationPolicy=always-up
       RequiredForOnline=yes
-      RequiredFamilyForOnline=both
+      RequiredFamilyForOnline={{ sshd_required_family_for_online }}
     create: false
     group: root
     insertbefore: '^\[Network\]\s*$'
@@ -69,7 +69,23 @@
   notify:
     - Restart sshd
 
-- name: Configure sshd_config
+- name: Add an ssh group
+  ansible.builtin.group:
+    local: false
+    name: ssh
+    state: present
+    system: true
+
+- name: Add user to ssh group
+  ansible.builtin.user:
+    append: true
+    groups:
+      - ssh
+    local: false
+    name: "{{ sshd_user }}"
+    state: present
+
+- name: Configure sshd_config (IPv4)
   ansible.builtin.lineinfile:
     backrefs: false
     create: true
@@ -82,7 +98,28 @@
     path: "/etc/ssh/sshd_config"
     regexp: "{{ item.pattern }}"
     state: present
-  loop: "{{ sshd_config_lines }}"
+  loop: "{{ sshd_ipv4_config_lines }}"
+  loop_control:
+    label: "{{ item.label }}"
+  notify:
+    - Restart sshd
+
+- name: Configure sshd_config (IPv6)
+  when:
+    - not (ipv4_only | default(false))
+  ansible.builtin.lineinfile:
+    backrefs: false
+    create: true
+    encoding: "utf-8"
+    firstmatch: false
+    group: root
+    line: "{{ item.line }}"
+    mode: "0664"
+    owner: root
+    path: "/etc/ssh/sshd_config"
+    regexp: "{{ item.pattern }}"
+    state: present
+  loop: "{{ sshd_ipv6_config_lines }}"
   loop_control:
     label: "{{ item.label }}"
   notify:
@@ -110,6 +147,8 @@
     label: "{{ item.comment }}"
 
 - name: Configure UFW IPv6 rules
+  when:
+    - not (ipv4_only | default(false))
   community.general.ufw:
     comment: "{{ item.comment }}"
     direction: "in"

roles/sshd/vars/main.yml

@@ -2,7 +2,12 @@
 
 sshd_port: 22
 
-sshd_config_lines:
+sshd_user: ladmin
+
+sshd_address_family: "{{ (ipv4_only | default(false)) | ansible.builtin.ternary('inet', 'any') }}"
+sshd_required_family_for_online: "{{ (ipv4_only | default(false)) | ansible.builtin.ternary('ipv4', 'both') }}"
+
+sshd_ipv4_config_lines:
   - label: PubkeyAuthentication
     pattern: '^\s*#*\s*PubkeyAuthentication\s*(yes|no)$'
     line: 'PubkeyAuthentication yes'
@@ -29,19 +34,24 @@ sshd_config_lines:
     line: 'UsePAM yes'
   - label: PermitRootLogin
     pattern: '^\s*#*\s*PermitRootLogin\s*(yes|no|prohibit-password)$'
-    line: 'PermitRootLogin prohibit-password'
+    line: 'PermitRootLogin no'
   - label: AddressFamily
     pattern: '^\s*#*\s*AddressFamily\s*(inet|inet6|any)$'
-    line: 'AddressFamily any'
+    line: "AddressFamily {{ sshd_address_family }}"
   - label: ListenAddress (IPv4)
     pattern: "^\\s*#*\\s*ListenAddress\\s*(0\\.0\\.0\\.0|{{ ipv4_address | replace('.', '\\.') }})$"
     line: "ListenAddress {{ ipv4_address }}"
-  - label: ListenAddress (IPv6)
-    pattern: "^\\s*#*\\s*ListenAddress\\s*(::|{{ ipv6_address}})$"
-    line: "ListenAddress {{ ipv6_address }}"
   - label: Port
     pattern: '^\s*#*\s*Port\s*[0-9]{1,5}$'
     line: "Port {{ sshd_port }}"
+  - label: AllowGroups
+    pattern: '^\s*#*\s*AllowGroups\s*.*$'
+    line: "AllowGroups ssh"
+
+sshd_ipv6_config_lines:
+  - label: ListenAddress (IPv6)
+    pattern: "^\\s*#*\\s*ListenAddress\\s*(::|{{ ipv6_address }})$"
+    line: "ListenAddress {{ ipv6_address }}"
 
 sshd_ufw_ipv4_rules:
   - comment: SSH Clients v4

roles/sudoers/tasks/main.yml

@@ -0,0 +1,76 @@
+# code: language=ansible
+
+- name: Ensure sudo is installed
+  community.general.pacman:
+    name:
+      - sudo
+    state: present
+    update_cache: true
+
+- name: Create the sudo group
+  ansible.builtin.group:
+    local: false
+    name: sudo
+    state: present
+    system: true
+
+- name: Get target users current groups
+  ansible.builtin.getent:
+    database: group
+    split: ':'
+  register: sudoers_user_groups_result
+
+- name: Set empty sudoers_user_target_groups
+  ansible.builtin.set_fact:
+    sudoers_user_target_groups: []
+
+- name: Loop group list and select groups containing sudoer user
+  when:
+    - sudoers_user in sudoers_user_groups_result.ansible_facts.getent_group[item]
+  ansible.builtin.set_fact:
+    sudoers_user_target_groups: "{{ sudoers_user_target_groups + [item] }}"
+  loop: "{{ sudoers_user_groups_result.ansible_facts.getent_group.keys() | list }}"
+  loop_control:
+    label: "{{ item }}"
+
+- name: Filter sudoers_user_target_groups for wheel and users groups, and ensure it contains sudo group
+  ansible.builtin.set_fact:
+    sudoers_user_target_groups: "{{ ((sudoers_user_target_groups | difference(['wheel', 'users'])) + ['sudo']) | unique }}"
+
+- name: Add user to sudo group and remove from wheel/users
+  ansible.builtin.user:
+    append: false
+    comment: "{{ sudoers_user_comment }}"
+    groups: "{{ sudoers_user_target_groups }}"
+    local: false
+    name: "{{ sudoers_user }}"
+    state: present
+
+- name: Add sudoers entry
+  community.general.sudoers:
+    commands:
+      - ALL
+    defaults:
+      - '!fqdn' # Ensures using shortname only when assessing hostname in sudo rule
+    group: sudo
+    host: "{{ inventory_hostname_short }}"
+    name: sudo_group
+    nopassword: false
+    runas: root
+    state: present
+    sudoers_path: "/etc/sudoers.d"
+    validation: required
+
+- name: Remove default sudoers file
+  ansible.builtin.file:
+    path: /etc/sudoers.d/90-cloud-init-users
+    state: absent
+
+- name: Disable root login
+  ansible.builtin.user:
+    expires: 0
+    name: root
+    password: '!'
+    password_lock: true
+    shell: /usr/bin/nologin
+    state: present

roles/sudoers/vars/main.yml

@@ -0,0 +1,4 @@
+# code: language=ansible
+
+sudoers_user: ladmin
+sudoers_user_comment: "Local Administrator"