imfreedom/ansible

Fix some fact detection and a bunch of yaml-lint issues

2021-11-22, Gary Kramlich
f3127045fa8c
Parents b3284064a84d
Children f379d3c47d7b
Fix some fact detection and a bunch of yaml-lint issues
5 files changed, 14 insertions(+), 13 deletions(-)
  • +3 -2
    roles/sources/handlers/main.yaml
  • +1 -0
    roles/sources/meta/main.yaml
  • +4 -1
    roles/sources/tasks/debian.yaml
  • +4 -8
    roles/sources/templates/debian-security.list.j2
  • +2 -2
    roles/sources/templates/debian-updates.list.j2
    • --- a/roles/sources/handlers/main.yaml Mon Nov 22 04:00:51 2021 -0600
    +++ b/roles/sources/handlers/main.yaml Mon Nov 22 04:03:47 2021 -0600
    @@ -1,4 +1,5 @@
    +---
    - name: update apt cache
    apt:
    - update_cache: yes
    - force_apt_get: yes
    + update_cache: "yes"
    + force_apt_get: "yes"
    --- a/roles/sources/meta/main.yaml Mon Nov 22 04:00:51 2021 -0600
    +++ b/roles/sources/meta/main.yaml Mon Nov 22 04:03:47 2021 -0600
    @@ -1,1 +1,2 @@
    +---
    dependencies: []
    --- a/roles/sources/tasks/debian.yaml Mon Nov 22 04:00:51 2021 -0600
    +++ b/roles/sources/tasks/debian.yaml Mon Nov 22 04:03:47 2021 -0600
    @@ -1,3 +1,7 @@
    +---
    +- name: force cache update to get correct facts
    + apt:
    + update_cache: "yes"
    - name: install debian-backports preferences
    template:
    src: debian-backports.preferences.j2
    @@ -5,7 +9,6 @@
    mode: 0644
    notify:
    - update apt cache
    -
    - name: install sources
    template:
    src: "{{ item }}.list.j2"
    --- a/roles/sources/templates/debian-security.list.j2 Mon Nov 22 04:00:51 2021 -0600
    +++ b/roles/sources/templates/debian-security.list.j2 Mon Nov 22 04:03:47 2021 -0600
    @@ -1,11 +1,7 @@
    {% if ansible_facts["distribution_major_version"]|int <= 10 %}
    -deb http://mirror.steadfast.net/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    -deb-src http://mirror.steadfast.net/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    -deb http://security.debian.org/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    -deb-src http://security.debian.org/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    +deb http://deb.debian.org/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    +deb-src http://deb.debian.org/debian-security {{ ansible_facts["distribution_release"] }}/updates main contrib non-free
    {% else %}
    -deb http://mirror.steadfast.net/debian {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    -deb-src http://mirror.steadfast.net/debian {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    -deb http://security.debian.org/debian-security {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    -deb-src http://security.debian.org/debian-security {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    +deb http://deb.debian.org/debian-security {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    +deb-src http://deb.debian.org/debian-security {{ ansible_facts["distribution_release"] }}-security main contrib non-free
    {% endif %}
    --- a/roles/sources/templates/debian-updates.list.j2 Mon Nov 22 04:00:51 2021 -0600
    +++ b/roles/sources/templates/debian-updates.list.j2 Mon Nov 22 04:03:47 2021 -0600
    @@ -1,2 +1,2 @@
    -deb http://ftp.us.debian.org/debian {{ ansible_facts["distribution_release"] }}-updates main contrib non-free
    -deb-src http://ftp.us.debian.org/debian {{ ansible_facts["distribution_release"] }}-updates main contrib non-free
    +deb http://mirrors.digitalocean.com/debian {{ ansible_facts["distribution_release"] }}-updates main contrib non-free
    +deb-src http://mirrors.digitalocean.com/debian {{ ansible_facts["distribution_release"] }}-updates main contrib non-free