switched to new facts-syntax

This commit is contained in:
2026-01-12 13:58:58 +01:00
parent 9fd07d57a4
commit 24f5e5b221
6 changed files with 14 additions and 14 deletions

View File

@@ -21,7 +21,7 @@
ansible.builtin.meta: end_play ansible.builtin.meta: end_play
when: when:
- marker_file_stat.stat.exists - marker_file_stat.stat.exists
- (ansible_date_time.epoch | int) - (marker_file_stat.stat.mtime | int) < (ansible_reboot_cooldown_minutes | int * 60) - (ansible_facts['date_time']['epoch'] | int) - (marker_file_stat.stat.mtime | int) < (ansible_reboot_cooldown_minutes | int * 60)
tags: always tags: always
- name: pre-run | set marker file path as a cached fact - name: pre-run | set marker file path as a cached fact

View File

@@ -41,7 +41,7 @@
- name: backup | tailscale | add tailscale apt key (debian-based) - name: backup | tailscale | add tailscale apt key (debian-based)
tags: packages,system,system setup,tailscale tags: packages,system,system setup,tailscale
get_url: get_url:
url: "https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution']_release }}.noarmor.gpg" url: "https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_release'] }}.noarmor.gpg"
dest: /usr/share/keyrings/tailscale-archive-keyring.gpg dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
mode: '0644' mode: '0644'
when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ] when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ]
@@ -49,7 +49,7 @@
- name: backup | tailscale | add tailscale repository (debian-based) - name: backup | tailscale | add tailscale repository (debian-based)
tags: packages,system,system setup,tailscale tags: packages,system,system setup,tailscale
apt_repository: apt_repository:
repo: "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution']_release }} main" repo: "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} main"
state: present state: present
filename: tailscale filename: tailscale
when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ] when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ]

View File

@@ -7,9 +7,9 @@
when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"]
- debug: - debug:
var: ansible_facts['distribution']_release var: ansible_facts['distribution_release']
- debug: - debug:
var: equivalents[ansible_facts['distribution']_release]['ubuntu'] var: equivalents[ansible_facts['distribution_release']]['ubuntu']
when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"]
@@ -37,7 +37,7 @@
- name: ansible setup | remove repository - Debian / Ubuntu - name: ansible setup | remove repository - Debian / Ubuntu
tags: ansible,ansible-setup tags: ansible,ansible-setup
apt_repository: apt_repository:
repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution']_release]['ubuntu'] }} main" repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution_release']]['ubuntu'] }} main"
state: absent state: absent
update_cache: no update_cache: no
filename: ansible filename: ansible
@@ -46,7 +46,7 @@
- name: ansible setup | update repository - Debian - name: ansible setup | update repository - Debian
tags: ansible,ansible-setup tags: ansible,ansible-setup
apt_repository: apt_repository:
repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution']_release]['ubuntu'] }} main" repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution_release]['ubuntu'] }} main"
state: present state: present
update_cache: yes update_cache: yes
filename: ansible filename: ansible
@@ -55,7 +55,7 @@
- name: ansible setup | update repository - Ubuntu - name: ansible setup | update repository - Ubuntu
tags: ansible,ansible-setup tags: ansible,ansible-setup
apt_repository: apt_repository:
repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_facts['distribution']_release }} main" repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_facts['distribution_release'] }} main"
state: present state: present
update_cache: yes update_cache: yes
filename: ansible filename: ansible

View File

@@ -40,8 +40,8 @@
- qemu-guest-agent - qemu-guest-agent
- virt-what - virt-what
when: when:
- ansible_virtualization_role == "guest" - ansible_facts['virtualization_role'] == "guest"
- ansible_virtualization_type == "kvm" - ansible_facts['virtualization_type'] == "kvm"
ignore_errors: true ignore_errors: true
- name: system setup | utilities | install utilities (arch) - name: system setup | utilities | install utilities (arch)

View File

@@ -14,8 +14,8 @@
job: "{{ item.job }}" job: "{{ item.job }}"
state: absent state: absent
when: when:
- ansible_virtualization_role == "NA" or ansible_virtualization_role == "guest" - ansible_facts['virtualization_role'] == "NA" or ansible_facts['virtualization_role'] == "guest"
- ansible_virtualization_type == "kvm" - ansible_facts['virtualization_type'] == "kvm"
loop: loop:
- { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 } - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 }
@@ -28,7 +28,7 @@
minute: "{{ item.minute }}" minute: "{{ item.minute }}"
job: "{{ item.job }}" job: "{{ item.job }}"
state: absent state: absent
when: ansible_virtualization_role != "guest" or ansible_virtualization_type != "kvm" when: ansible_facts['virtualization_role'] != "guest" or ansible_facts['virtualization_type'] != "kvm"
loop: loop:
- { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 } - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 }

View File

@@ -18,7 +18,7 @@
ansible.builtin.lineinfile: ansible.builtin.lineinfile:
path: "/etc/apt/sources.list.d/php.list" path: "/etc/apt/sources.list.d/php.list"
state: present state: present
line: "deb https://packages.sury.org/php/ {{ ansible_facts['distribution']_release | lower }} main" line: "deb https://packages.sury.org/php/ {{ ansible_facts['distribution_release'] | lower }} main"
create: True create: True
- name: webservers | nextcloud | prereq | install php - name: webservers | nextcloud | prereq | install php