From 169f3195bdd09b9c194aaa4c4fcc9df7ba334b1b Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 7 Mar 2022 12:07:17 +0100 Subject: [PATCH 1/3] Adding optional support for debian backports --- defaults/main.yml | 1 + templates/apt.sources.list.j2 | 20 ++++++++++++++++++++ templates/apt.sources.list_legacy.j2 | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index f5183e5..5a90c01 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,6 +9,7 @@ base__add_ethz: true # add nonfree/firmware packages? base__pkg_non_free_firmware: true base__pkg_contrib: true +base__pkg_backports: false # add security repo base__pkg_security: true diff --git a/templates/apt.sources.list.j2 b/templates/apt.sources.list.j2 index a2a6a3d..c877aff 100644 --- a/templates/apt.sources.list.j2 +++ b/templates/apt.sources.list.j2 @@ -60,6 +60,26 @@ deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates {{- '\n\n' -}} {%- endif -%} +{%- if base__pkg_backports -%} +# {{ ansible_distribution_release }}-backports +deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main + {%- if base__pkg_contrib | bool -%} + {{- ' contrib' -}} + {%- endif -%} + {%- if base__pkg_non_free_firmware | bool -%} + {{- ' non-free' -}} + {%- endif -%} + {{- '\n' -}} +deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main + {%- if base__pkg_contrib | bool -%} + {{- ' contrib' -}} + {%- endif -%} + {%- if base__pkg_non_free_firmware | bool -%} + {{- ' non-free' -}} + {%- endif -%} + {{- '\n\n' -}} +{%- endif -%} + # Contact for proplems with the mirror: # https://readme.phys.ethz.ch/services/contact/ # Or #isgphys on irc.phys.ethz.ch diff --git a/templates/apt.sources.list_legacy.j2 b/templates/apt.sources.list_legacy.j2 index 4d394a7..3c7090f 100644 --- a/templates/apt.sources.list_legacy.j2 +++ b/templates/apt.sources.list_legacy.j2 @@ -59,6 +59,26 @@ deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates {{- '\n\n' -}} {%- endif -%} +{%- if base__pkg_backports -%} +# {{ ansible_distribution_release }}-backports +deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main + {%- if base__pkg_contrib | bool -%} + {{- ' contrib' -}} + {%- endif -%} + {%- if base__pkg_non_free_firmware | bool -%} + {{- ' non-free' -}} + {%- endif -%} + {{- '\n' -}} +deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main + {%- if base__pkg_contrib | bool -%} + {{- ' contrib' -}} + {%- endif -%} + {%- if base__pkg_non_free_firmware | bool -%} + {{- ' non-free' -}} + {%- endif -%} + {{- '\n\n' -}} +{%- endif -%} + # Contact for proplems with the mirror: # https://readme.phys.ethz.ch/services/contact/ # Or #isgphys on irc.phys.ethz.ch From c0401ab4535a8972c642e89c3ac9ded888cf4cbe Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 7 Mar 2022 12:08:33 +0100 Subject: [PATCH 2/3] increase version --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index bf4ee51..f33077f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -62,5 +62,5 @@ base__linux_packages: - bzip2 - jq -playbook_version_number: 9017 +playbook_version_number: 9018 playbook_version_path: 'base-packages_roles-ansible_github.version' From 60cd9c1414ae48a3aebb1eab3444e2db26de231e Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 4 Apr 2022 13:22:46 +0200 Subject: [PATCH 3/3] update ansible linting --- .github/workflows/ansible-debian-stable.yml | 6 +----- .github/workflows/ansible-linting-check.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ansible-debian-stable.yml b/.github/workflows/ansible-debian-stable.yml index 38a456d..e47f773 100644 --- a/.github/workflows/ansible-debian-stable.yml +++ b/.github/workflows/ansible-debian-stable.yml @@ -2,11 +2,7 @@ name: Ansible check debian:stable # yamllint disable-line rule:truthy -on: - push: - branches: '*' - pull_request: - branches: '*' +on: [push, pull_request] jobs: build: diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index ab63487..0b743f7 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -17,10 +17,6 @@ jobs: - uses: actions/checkout@v2 - name: Lint Ansible Playbook - uses: ansible/ansible-lint-action@master + uses: ansible/ansible-lint-action@v6 with: targets: "." - # [required] - # Paths to ansible files (i.e., playbooks, tasks, handlers etc..) - args: "" - # [optional]