comparing 35bd6a1b9542b54823dbca07b4b58801d4ed4a2c and main on hyperreal.bsky.moonshadow.dev/ansible-homelab

+1 -1

check-borgmatic.yml

···

       1
       1
        
       ---

     

       2
       2
        
       - name: Check the date of the last borgmatic archive

     

       3
       3
       -
         hosts: borgmatichosts

     

       3
       3
       +
         hosts: borgmatic_hosts

     

       4
       4
        
         gather_facts: true

     

       5
       5
        
         become: true

     

       6
       6
        
         tasks:

+1 -19

debian-update.yml

···

       1
       1
        
       ---

     

       2
       2
       -
       - hosts: debianservers

     

       2
       2
       +
       - hosts: debian_servers

     

       3
       3
        
         gather_facts: true

     

       4
       4
        
         become: true

     

       5
       5
        
       

     
···

       11
       11
        
           - name: Perform a dist-upgrade

     

       12
       12
        
             ansible.builtin.apt:

     

       13
       13
        
               upgrade: dist

     

       14
       14
       -
       

     

       15
       15
       -
           - name: Check if backports are enabled in sources.list

     

       16
       16
       -
             ansible.builtin.lineinfile:

     

       17
       17
       -
               path: /etc/apt/sources.list

     

       18
       18
       -
               regex: "backports"

     

       19
       19
       -
               state: absent

     

       20
       20
       -
             changed_when: false

     

       21
       21
       -
             check_mode: true

     

       22
       22
       -
             register: backports

     

       23
       23
       -
       

     

       24
       24
       -
           - name: Perform a dist-upgrade from Debian backports

     

       25
       25
       -
             ansible.builtin.apt:

     

       26
       26
       -
               default_release: bookworm-backports

     

       27
       27
       -
               update_cache: true

     

       28
       28
       -
               upgrade: dist

     

       29
       29
       -
             when:

     

       30
       30
       -
               - ansible_distribution == 'Debian'

     

       31
       31
       -
               - backports.found == 1

     

       32
       14
        
       

     

       33
       15
        
           - name: Check if reboot is required

     

       34
       16
        
             ansible.builtin.stat:

+19 -13

freebsd-update.yml

···

       1
       1
       -
       ---

     

       2
       2
       -
       - hosts: freebsdservers

     

       1
       1
       +
       - hosts: freebsd_servers

     

       3
       2
        
         gather_facts: true

     

       4
       3
        
         become: true

     

       5
       5
       -
         vars:

     

       6
       6
       -
           jails:

     

       7
       7
       -
             - aa-torrenting

     

       8
       8
       -
       

     

       9
       4
        
         tasks:

     

       10
       5
        
           - name: Update all installed packages

     

       11
       6
        
             community.general.pkgng:

     

       12
       7
        
               name: "*"

     

       13
       8
        
               state: latest

     

       14
       14
       -
       

     

       15
       15
       -
           - name: Update all installed packages in jails

     

       16
       16
       -
             community.general.pkgng:

     

       17
       17
       -
               name: "*"

     

       18
       18
       -
               state: latest

     

       19
       19
       -
               jail: "{{ item }}"

     

       20
       20
       -
             with_items: "{{ jails }}"

     

       9
       9
       +
           - name: Update the base system

     

       10
       10
       +
             ansible.builtin.shell: freebsd-update fetch install --not-running-from-cron

     

       11
       11
       +
           - name: Get currently running FreeBSD kernel version in memory

     

       12
       12
       +
             ansible.builtin.shell: freebsd-version -r

     

       13
       13
       +
             register: running_kv

     

       14
       14
       +
           - name: Get newly installed kernel version

     

       15
       15
       +
             ansible.builtin.shell: freebsd-version -k

     

       16
       16
       +
             register: installed_kv

     

       17
       17
       +
           - name: Check for kernel version mismatch

     

       18
       18
       +
             set_fact:

     

       19
       19
       +
               reboot_required: "{{ running_kv.stdout != installed_kv.stdout }}"

     

       20
       20
       +
           - name: Display reboot status

     

       21
       21
       +
             ansible.builtin.debug:

     

       22
       22
       +
               msg: "Reboot required: {{ reboot_required }}"

     

       23
       23
       +
           - name: Reboot the FreeBSD server if needed

     

       24
       24
       +
             ansible.builtin.reboot:

     

       25
       25
       +
               reboot_timeout: 3600

     

       26
       26
       +
             when: reboot_required

+15 -41

inventory.yml

···

       1
       1
       -
       borgmatichosts:

     

       1
       1
       +
       borgmatic_hosts:

     

       2
       2
        
         hosts:

     

       3
       3
        
           desktop:

     

       4
       4
        
             ansible_user: jas

     

       5
       5
       -
             ansible_host: localhost

     

       6
       6
       -
             ansible_python_interpreter: /usr/bin/python3

     

       7
       7
       -
           hyperreal.coffee:

     

       8
       8
       -
             ansible_user: jas

     

       9
       9
       -
             ansible_host: hyperreal.headscale.moonshadow.dev

     

       5
       5
       +
             ansible_host: desktop.carp-wyvern.ts.net

     

       10
       6
        
             ansible_python_interpreter: /usr/bin/python3

     

       11
       7
        
           nas:

     

       12
       8
        
             ansible_user: jas

     

       13
       13
       -
             ansible_host: nas.headscale.moonshadow.dev

     

       14
       14
       -
             ansible_python_interpreter: /usr/local/bin/python3

     

       15
       15
       -
           moonshadow:

     

       16
       16
       -
             ansible_user: jas

     

       17
       17
       -
             ansible_host: moonshadow.headscale.moonshadow.dev

     

       18
       18
       -
             ansible_python_interpreter: /usr/local/bin/python3

     

       19
       19
       -
       

     

       20
       20
       -
       debianservers:

     

       9
       9
       +
             ansible_host: nas.carp-wyvern.ts.net

     

       10
       10
       +
             ansible_python_interpreter: /usr/local/bin/python3.11

     

       11
       11
       +
       debian_servers:

     

       21
       12
        
         hosts:

     

       22
       22
       -
           hyperreal.coffee:

     

       13
       13
       +
           moonshadow:

     

       23
       14
        
             ansible_user: jas

     

       24
       24
       -
             ansible_host: hyperreal.headscale.moonshadow.dev

     

       15
       15
       +
             ansible_host: moonshadow.carp-wyvern.ts.net

     

       25
       16
        
             ansible_python_interpreter: /usr/bin/python3

     

       26
       26
       -
           rpi400:

     

       27
       27
       -
             ansible_user: root

     

       28
       28
       -
             ansible_host: rpi400.headscale.moonshadow.dev

     

       29
       29
       -
             ansible_python_interpreter: /usr/bin/python3

     

       30
       30
       -
       

     

       31
       31
       -
       freebsdservers:

     

       17
       17
       +
       freebsd_servers:

     

       32
       18
        
         hosts:

     

       33
       19
        
           nas:

     

       34
       34
       -
             ansible_user: jas

     

       35
       35
       -
             ansible_host: nas.headscale.moonshadow.dev

     

       36
       36
       -
             ansible_python_interpreter: /usr/local/bin/python3

     

       37
       37
       -
           moonshadow:

     

       38
       38
       -
             ansible_user: jas

     

       39
       39
       -
             ansible_host: moonshadow.headscale.moonshadow.dev

     

       40
       40
       -
             ansible_python_interpreter: /usr/local/bin/python3

     

       41
       41
       -
       

     

       42
       42
       -
       promservers:

     

       43
       43
       -
         hosts:

     

       44
       44
       -
           desktop:

     

       45
       45
       -
             ansible_user: jas

     

       46
       46
       -
             ansible_host: localhost

     

       47
       47
       -
             ansible_python_interpreter: /usr/bin/python3

     

       48
       48
       -
       

     

       49
       49
       -
       promclients:

     

       50
       50
       -
         children:

     

       51
       51
       -
           debianservers:

     

       52
       52
       -
           freebsdservers:

     

       20
       20
       +
             ansible_user: root

     

       21
       21
       +
             ansible_host: nas.carp-wyvern.ts.net

     

       22
       22
       +
             ansible_python_interpreter: /usr/local/bin/python3.11

     

       23
       23
       +
           tornode:

     

       24
       24
       +
             ansible_user: root

     

       25
       25
       +
             ansible_host: tornode

     

       26
       26
       +
             ansible_python_interpreter: /usr/local/bin/python3.11

+5 -18

prometheus-clients.yml

···

       1
       1
        
       ---

     

       2
       2
       -
       - hosts: promclients

     

       2
       2
       +
       - hosts: prom_clients

     

       3
       3
        
         tasks:

     

       4
       4
        
           - name: Import Node Exporter role

     

       5
       5
        
             import_role:

     
···

       14
       14
        
             become: true

     

       15
       15
        
       

     

       16
       16
        
           - name: Enable node_exporter service on FreeBSD

     

       17
       17
       -
             ansible.builtin.shell: sysrc node_exporter_enable="YES"

     

       17
       17
       +
             ansible.builtin.service:

     

       18
       18
       +
               name: node_exporter

     

       19
       19
       +
               enabled: true

     

       20
       20
       +
               state: started

     

       18
       21
        
             when: ansible_service_mgr == "bsdinit"

     

       19
       19
       -
             register: node_exporter_enable

     

       20
       20
       -
             become: true

     

       21
       21
       -
             changed_when: '"node_exporter_enable:  -> YES" in node_exporter_enable.stdout'

     

       22
       22
       -
       

     

       23
       23
       -
           - name: Check if node_exporter service is running on FreeBSD

     

       24
       24
       -
             ansible.builtin.shell: service node_exporter status

     

       25
       25
       -
             when: ansible_service_mgr == "bsdinit"

     

       26
       26
       -
             register: node_exporter_running

     

       27
       27
       -
             failed_when: '"node_exporter does not exist" in node_exporter_running.stdout'

     

       28
       28
       -
             changed_when: false

     

       29
       29
       -
       

     

       30
       30
       -
           - name: Start node_exporter service on FreeBSD

     

       31
       31
       -
             ansible.builtin.shell: service node_exporter start

     

       32
       32
       -
             when:

     

       33
       33
       -
               - ansible_service_mgr == "bsdinit"

     

       34
       34
       -
               - '"node_exporter is not running" in node_exporter_running.stdout'

     

       35
       22
        
             become: true

+1 -1

prometheus-servers.yml

···

       1
       1
        
       ---

     

       2
       2
       -
       - hosts: promservers

     

       2
       2
       +
       - hosts: prom_servers

     

       3
       3
        
         tasks:

     

       4
       4
        
           - name: Import Node Exporter role

     

       5
       5
        
             import_role:

+5 -15

remote-logging-setup.yml

···

       1
       1
       -
       ---

     

       2
       2
       -
       - hosts: debianservers,freebsdservers

     

       1
       1
       +
       - hosts: remote_logging_clients

     

       3
       2
        
         gather_facts: true

     

       4
       3
        
         become: true

     

       5
       5
       -
       

     

       6
       4
        
         tasks:

     

       7
       5
        
           - name: Ensure rsyslog is installed

     

       8
       6
        
             ansible.builtin.package:

     

       9
       7
        
               name: rsyslog

     

       10
       8
        
               state: latest

     

       11
       9
        
             when: ansible_system == "Linux"

     

       12
       12
       -
       

     

       13
       10
        
           - name: Ensure rsyslog is enabled

     

       14
       11
        
             ansible.builtin.systemd_service:

     

       15
       12
        
               name: rsyslog

     

       16
       13
        
               enabled: true

     

       17
       14
        
               state: started

     

       18
       15
        
             when: ansible_service_mgr == "systemd"

     

       19
       19
       -
       

     

       20
       16
        
           - name: Remove any forwarding file if exists

     

       21
       17
        
             ansible.builtin.file:

     

       22
       18
        
               path: /etc/rsyslog.d/forward.conf

     

       23
       19
        
               state: absent

     

       24
       20
        
             when: ansible_system == "Linux"

     

       25
       25
       -
       

     

       26
       26
       -
           - name: Get control node headnet IP address

     

       27
       27
       -
             ansible.builtin.shell: tailscale status | head -1 | awk '{print $1}'

     

       21
       21
       +
           - name: Get remote logging server headnet IP address

     

       22
       22
       +
             ansible.builtin.shell: tailscale status | grep "aux" | awk '{print $1}'

     

       28
       23
        
             register: ctrl_headnet_ip_addr

     

       29
       29
       -
             delegate_to: 127.0.0.1

     

       30
       24
        
             changed_when: false

     

       31
       25
        
             failed_when: ctrl_headnet_ip_addr.rc != 0

     

       32
       32
       -
       

     

       33
       26
        
           - name: Configure log forwarding

     

       34
       27
        
             ansible.builtin.blockinfile:

     

       35
       28
        
               path: /etc/rsyslog.d/forward.conf

     
···

       38
       31
        
               group: root

     

       39
       32
        
               mode: 0644

     

       40
       33
        
               block: |

     

       41
       41
       -
                 # Forward to desktop.headscale.moonshadow.dev ({{ctrl_headnet_ip_addr.stdout}})

     

       34
       34
       +
                 # Forward to aux.carp-wyvern.ts.net ({{ctrl_headnet_ip_addr.stdout}})

     

       42
       35
        
                 *.* action(type="omfwd" target="{{ctrl_headnet_ip_addr.stdout}}" port="514" protocol="tcp"

     

       43
       36
        
                     action.resumeRetryCount="100"

     

       44
       37
        
                     queue.type="linkedList" queue.size="10000")

     

       45
       38
        
             when: ansible_system == "Linux"

     

       46
       46
       -
       

     

       47
       39
        
           - name: Restart rsyslog

     

       48
       40
        
             ansible.builtin.systemd_service:

     

       49
       41
        
               name: rsyslog

     

       50
       42
        
               enabled: true

     

       51
       43
        
               state: restarted

     

       52
       44
        
             when: ansible_service_mgr == "systemd"

     

       53
       53
       -
       

     

       54
       45
        
           - name: Set syslog flags for remote logging on FreeBSD

     

       55
       46
        
             ansible.builtin.shell: sysrc syslog_flags="-s -v -v"

     

       56
       47
        
             register: set_syslog_flags

     

       57
       48
        
             changed_when: '"syslog_flags:  -> YES" in set_syslog_flags.stdout'

     

       58
       49
        
             when: ansible_service_mgr == "bsdinit"

     

       59
       59
       -
       

     

       60
       50
        
           - name: Set log forwarding on FreeBSD

     

       61
       51
        
             ansible.builtin.lineinfile:

     

       62
       52
        
               path: /etc/syslog.conf

     

       53
       53
       +
               regexp: '^\*\.\*'

     

       63
       54
        
               line: "*.* @{{ctrl_headnet_ip_addr.stdout}}"

     

       64
       55
        
               owner: root

     

       65
       56
        
               group: wheel

     

       66
       57
        
               mode: 0644

     

       67
       58
        
             when: ansible_system == "FreeBSD"

     

       68
       68
       -
       

     

       69
       59
        
           - name: Restart syslogd

     

       70
       60
        
             ansible.builtin.service:

     

       71
       61
        
               name: syslogd

+38

zfs-log-compress.yml

···

       1
       1
       +
       # Based on https://github.com/FreeBSDFoundation/blog/blob/main/zfs-log-compression-on-freebsd/zfs_log_compress.yml

     

       2
       2
       +
       ---

     

       3
       3
       +
       - name: Remove log compression on FreeBSD host, add timestamps to rotated logs

     

       4
       4
       +
         hosts: freebsd_servers

     

       5
       5
       +
         gather_facts: true

     

       6
       6
       +
         become: true

     

       7
       7
       +
         tasks:

     

       8
       8
       +
           - name: Set compression of /var/log dataset to zstd

     

       9
       9
       +
             community.general.zfs:

     

       10
       10
       +
               name: zroot/var/log

     

       11
       11
       +
               state: present

     

       12
       12
       +
               extra_zfs_properties:

     

       13
       13
       +
                 compression: zstd

     

       14
       14
       +
       

     

       15
       15
       +
           - name: Remove 'J' from the newsyslog.conf file

     

       16
       16
       +
             ansible.builtin.replace:

     

       17
       17
       +
               path: /etc/newsyslog.conf

     

       18
       18
       +
               regexp: "^J|J"

     

       19
       19
       +
               replace: ""

     

       20
       20
       +
             notify: "Restart newsyslog service"

     

       21
       21
       +
       

     

       22
       22
       +
           - name: Use timestamps instead of numbers for log rotations

     

       23
       23
       +
             ansible.builtin.replace:

     

       24
       24
       +
               path: /etc/crontab

     

       25
       25
       +
               regexp: "newsyslog$"

     

       26
       26
       +
               replace: "newsyslog -t DEFAULT"

     

       27
       27
       +
             notify: "Restart syslogd service"

     

       28
       28
       +
       

     

       29
       29
       +
         handlers:

     

       30
       30
       +
           - name: Restart newsyslog service

     

       31
       31
       +
             ansible.builtin.service:

     

       32
       32
       +
               name: newsyslog

     

       33
       33
       +
               state: restarted

     

       34
       34
       +
       

     

       35
       35
       +
           - name: Restart syslogd service

     

       36
       36
       +
             ansible.builtin.service:

     

       37
       37
       +
               name: syslogd

     

       38
       38
       +
               state: restarted

Compare changes