Merge pull request #14 from roles-ansible/backports

Adding optional support for debian backports

.github/workflows/ansible-debian-stable.yml

@@ -2,11 +2,7 @@
 name: Ansible check debian:stable
 
 # yamllint disable-line rule:truthy
-on:
+on: [push, pull_request]
-  push:
-    branches: '*'
-  pull_request:
-    branches: '*'
 
 jobs:
   build:

.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]

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

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

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

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'