comparing 603bb9a89e6d34ef14e9566dd963bc1214e466cc and main on hyperreal.bsky.moonshadow.dev/ansible-homelab

-8

freebsd-update.yml

···

       1
       1
       -
       ---

     

       2
       1
        
       - hosts: freebsd_servers

     

       3
       2
        
         gather_facts: true

     

       4
       3
        
         become: true

     

       5
       5
       -
       

     

       6
       4
        
         tasks:

     

       7
       5
        
           - name: Update all installed packages

     

       8
       6
        
             community.general.pkgng:

     

       9
       7
        
               name: "*"

     

       10
       8
        
               state: latest

     

       11
       11
       -
       

     

       12
       9
        
           - name: Update the base system

     

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

     

       14
       14
       -
       

     

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

     

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

     

       17
       13
        
             register: running_kv

     

       18
       18
       -
       

     

       19
       14
        
           - name: Get newly installed kernel version

     

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

     

       21
       16
        
             register: installed_kv

     

       22
       22
       -
       

     

       23
       17
        
           - name: Check for kernel version mismatch

     

       24
       18
        
             set_fact:

     

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

     

       26
       26
       -
       

     

       27
       20
        
           - name: Display reboot status

     

       28
       21
        
             ansible.builtin.debug:

     

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

     

       30
       30
       -
       

     

       31
       23
        
           - name: Reboot the FreeBSD server if needed

     

       32
       24
        
             ansible.builtin.reboot:

     

       33
       25
        
               reboot_timeout: 3600

+10 -35

inventory.yml

···

       1
       1
        
       borgmatic_hosts:

     

       2
       2
        
         hosts:

     

       3
       3
       -
           hyperreal:

     

       3
       3
       +
           desktop:

     

       4
       4
        
             ansible_user: jas

     

       5
       5
       -
             ansible_host: hyperreal.carp-wyvern.ts.net

     

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

     

       6
       6
        
             ansible_python_interpreter: /usr/bin/python3

     

       7
       7
        
           nas:

     

       8
       8
        
             ansible_user: jas

     

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

     

       10
       10
       -
             ansible_python_interpreter: /usr/bin/python3

     

       11
       11
       -
           dietpi:

     

       12
       12
       -
             ansible_user: jas

     

       13
       13
       -
             ansible_host: dietpi.carp-wyvern.ts.net

     

       14
       14
       -
             ansible_python_interpreter: /usr/bin/python3

     

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

     

       15
       11
        
       debian_servers:

     

       16
       12
        
         hosts:

     

       17
       17
       -
           dietpi:

     

       18
       18
       -
             ansible_user: dietpi

     

       19
       19
       -
             ansible_host: dietpi.carp-wyvern.ts.net

     

       20
       20
       -
             ansible_python_interpreter: /usr/bin/python3

     

       21
       21
       -
           hyperreal:

     

       13
       13
       +
           moonshadow:

     

       22
       14
        
             ansible_user: jas

     

       23
       23
       -
             ansible_host: hyperreal.carp-wyvern.ts.net

     

       24
       24
       -
             ansible_python_interpreter: /usr/bin/python3

     

       25
       25
       -
           nas-aux:

     

       26
       26
       -
             ansible_user: jas

     

       27
       27
       -
             ansible_host: nas-aux.carp-wyvern.ts.net

     

       28
       28
       -
             ansible_python_interpreter: /usr/bin/python3

     

       29
       29
       -
           aux-remote:

     

       30
       30
       -
             ansible_user: jas

     

       31
       31
       -
             ansible_host: aux-remote.carp-wyvern.ts.net

     

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

     

       32
       16
        
             ansible_python_interpreter: /usr/bin/python3

     

       33
       17
        
       freebsd_servers:

     

       34
       18
        
         hosts:

     

       35
       19
        
           nas:

     

       36
       36
       -
             ansible_user: jas

     

       20
       20
       +
             ansible_user: root

     

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

     

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

     

       39
       39
       -
       prom_servers:

     

       40
       40
       -
         hosts:

     

       41
       41
       -
           nas-aux:

     

       42
       42
       -
             ansible_user: jas

     

       43
       43
       -
             ansible_host: nas-aux.carp-wyvern.ts.net

     

       44
       44
       -
             ansible_python_interpreter: /usr/bin/python3

     

       45
       45
       -
       prom_clients:

     

       46
       46
       -
         children:

     

       47
       47
       -
           debian_servers:

     

       48
       48
       -
       remote_logging_clients:

     

       49
       49
       -
         children:

     

       50
       50
       -
           debian_servers:

     

       51
       51
       -
           freebsd_servers:

     

       23
       23
       +
           tornode:

     

       24
       24
       +
             ansible_user: root

     

       25
       25
       +
             ansible_host: tornode

     

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

+19 -42

remote-logging-setup.yml

···

       2
       2
        
         gather_facts: true

     

       3
       3
        
         become: true

     

       4
       4
        
         tasks:

     

       5
       5
       -
           - name: Ensure syslog-ng is installed

     

       5
       5
       +
           - name: Ensure rsyslog is installed

     

       6
       6
        
             ansible.builtin.package:

     

       7
       7
       -
               name: syslog-ng

     

       7
       7
       +
               name: rsyslog

     

       8
       8
        
               state: latest

     

       9
       9
        
             when: ansible_system == "Linux"

     

       10
       10
       -
           - name: Ensure syslog-ng is enabled

     

       10
       10
       +
           - name: Ensure rsyslog is enabled

     

       11
       11
        
             ansible.builtin.systemd_service:

     

       12
       12
       -
               name: syslog-ng

     

       12
       12
       +
               name: rsyslog

     

       13
       13
        
               enabled: true

     

       14
       14
        
               state: started

     

       15
       15
        
             when: ansible_service_mgr == "systemd"

     

       16
       16
        
           - name: Remove any forwarding file if exists

     

       17
       17
        
             ansible.builtin.file:

     

       18
       18
       -
               path: /etc/syslog-ng/conf.d/forward.conf

     

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

     

       19
       19
        
               state: absent

     

       20
       20
        
             when: ansible_system == "Linux"

     

       21
       21
       -
           - name: Get remote logging server tailnet IP address

     

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

     

       23
       23
       -
             register: ctrl_tailnet_ip_addr

     

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

     

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

     

       23
       23
       +
             register: ctrl_headnet_ip_addr

     

       24
       24
        
             changed_when: false

     

       25
       25
       -
             failed_when: ctrl_tailnet_ip_addr.rc != 0

     

       26
       26
       -
           - name: Configure log forwarding (Debian)

     

       25
       25
       +
             failed_when: ctrl_headnet_ip_addr.rc != 0

     

       26
       26
       +
           - name: Configure log forwarding

     

       27
       27
        
             ansible.builtin.blockinfile:

     

       28
       28
       -
               path: /etc/syslog-ng/conf.d/forward.conf

     

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

     

       29
       29
        
               create: true

     

       30
       30
        
               owner: root

     

       31
       31
        
               group: root

     

       32
       32
        
               mode: 0644

     

       33
       33
        
               block: |

     

       34
       34
       -
                 # Forward to nas-aux ({{ctrl_tailnet_ip_addr.stdout}})

     

       35
       35
       -
                 destination d_ewmm {

     

       36
       36
       -
                   syslog-ng(server("{{ctrl_tailnet_ip_addr.stdout}}"));

     

       37
       37
       -
                 };

     

       38
       38
       -
       

     

       39
       39
       -
                 log {

     

       40
       40
       -
                   source(s_src);

     

       41
       41
       -
                   destination(d_ewmm);

     

       42
       42
       -
                 };

     

       43
       43
       -
             when: ansible_os_family == "Debian"

     

       44
       44
       -
           - name: Configure log forwarding (Red Hat)

     

       45
       45
       -
             ansible.builtin.blockinfile:

     

       46
       46
       -
               path: /etc/syslog-ng/conf.d/forward.conf

     

       47
       47
       -
               create: true

     

       48
       48
       -
               owner: root

     

       49
       49
       -
               group: root

     

       50
       50
       -
               mode: 0644

     

       51
       51
       -
               block: |

     

       52
       52
       -
                 # Forward to nas-aux ({{ctrl_tailnet_ip_addr.stdout}})

     

       53
       53
       -
                 destination d_ewmm {

     

       54
       54
       -
                   syslog-ng(server("{{ctrl_tailnet_ip_addr.stdout}}"));

     

       55
       55
       -
                 };

     

       56
       56
       -
       

     

       57
       57
       -
                 log {

     

       58
       58
       -
                   source(s_sys);

     

       59
       59
       -
                   destination(d_ewmm);

     

       60
       60
       -
                 };

     

       61
       61
       -
             when: ansible_os_family == "RedHat"

     

       62
       62
       -
           - name: Restart syslog-ng

     

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

     

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

     

       36
       36
       +
                     action.resumeRetryCount="100"

     

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

     

       38
       38
       +
             when: ansible_system == "Linux"

     

       39
       39
       +
           - name: Restart rsyslog

     

       63
       40
        
             ansible.builtin.systemd_service:

     

       64
       64
       -
               name: syslog-ng

     

       41
       41
       +
               name: rsyslog

     

       65
       42
        
               enabled: true

     

       66
       43
        
               state: restarted

     

       67
       44
        
             when: ansible_service_mgr == "systemd"

     
···

       74
       51
        
             ansible.builtin.lineinfile:

     

       75
       52
        
               path: /etc/syslog.conf

     

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

     

       77
       77
       -
               line: "*.* @{{ctrl_tailnet_ip_addr.stdout}}"

     

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

     

       78
       55
        
               owner: root

     

       79
       56
        
               group: wheel

     

       80
       57
        
               mode: 0644

Compare changes