Improving ETHZ Packages List

+ Cleanup
+ Improve ETHZ Packages List
+ Variables for ETHZ

README.md

@@ -13,12 +13,15 @@ By default it will also add the [ETH Zürich Debian Packages Mirror](https://deb
 
 | variable | default value | useage |
 | --- | --- | --- |
-| ``l3d_pkgs__adding_ethz`` | ``true`` | Adding the swiss ETH package mirror |
 | ``l3d_pkgs__package_state`` | ``present`` | Package State, set to ``latest`` to upgrade packages managed by this role |
 | ``l3d_pkgs__install_advanced`` | ``false`` | Install some advanced packages like tcpdump, mtr, fio and ethertools. See ``vars/main.yml`` for details |
 | ``l3d_pkgs__install_python`` | ``false`` | Install some Python packages like python3-pip. See ``vars/main.yml`` for details |
 | ``l3d_pkgs__install_cli`` | ``false`` | Install some CLI packages like htop, ranger and asciinema. See ``vars/main.yml`` for details |
 | ``l3d_pkgs__install_extra_packages`` | | List of additional packages to install |
+| ``l3d_pkgs__adding_ethz`` | ``true`` | Adding the swiss ETH package mirror |
+| ``l3d_pkgs__ethz_contrib`` | ``true`` | contrib packages contain DFSG-compliant software |
+| ``l3d_pkgs__ethz_non_free`` | ``true`` | non-free contains software that does not comply with the DFSG. |
+| ``l3d_pkgs__ethz_non_free_firmware`` | ``true`` | contains non-free-firmware packages |
 | ``submodules_versioncheck`` | ``false`` | Enable simple versioncheck to prevent running old versions of this role |
 
  Contributing

defaults/main.yml

@@ -1,6 +1,10 @@
 ---
 # Adding additional Package Server hosted by ETH Zürich
 l3d_pkgs__adding_ethz: true
+l3d_pkgs__ethz_contrib: true
+l3d_pkgs__ethz_non_free: true
+l3d_pkgs__ethz_non_free_firmware: true
+
 
 # Methods for updating Packages
 # set this to latest for updating packages managed by this role

tasks/editor.yml

@@ -1,24 +0,0 @@
----
-- name: Vim is our editor
-  become: true
-  community.general.alternatives:
-    name: editor
-    path: /usr/bin/vim.basic
-  when:
-    - base__install_vim | bool
-    - ansible_distribution != 'CentOS'
-    - ansible_distribution != 'RedHat'
-    - ansible_distribution != 'Archlinux'
-  failed_when: false
-
-- name: Vim is our editor
-  become: true
-  community.general.alternatives:
-    name: editor
-    path: /usr/bin/vim
-  when:
-    - base__install_vim | bool
-    - ansible_distribution == 'CentOS'
-    - ansible_distribution == 'RedHat'
-    - ansible_distribution == 'Archlinux'
-  failed_when: false

tasks/sources_ethz.yml

@@ -16,7 +16,7 @@
       - apt-transport-https
     state: present
 
-- name: Add eth zurich apt for Debian Bullaeye (11) and later
+- name: Add ETH zurich apt for Debian
   become: true
   ansible.builtin.template:
     src: "templates/apt.sources.list.j2"
@@ -25,18 +25,6 @@
     group: root
     owner: root
   notify: Run apt update
-  when: ansible_distribution_major_version > '10'
-
-- name: Add eth zurich apt for Debian Buster (10) and earlyer
-  become: true
-  ansible.builtin.template:
-    src: "templates/apt.sources.list_legacy.j2"
-    dest: '/etc/apt/sources.list.d/debian_ethz_ch_debian.list'
-    mode: 0644
-    group: root
-    owner: root
-  notify: Run apt update
-  when: ansible_distribution_major_version < '11'
 
 - name: Force all notified handlers to run at this point, not waiting for normal sync points
   ansible.builtin.meta: flush_handlers

templates/apt.sources.list.j2

@@ -4,50 +4,58 @@
 
 # HTTPS mirror:
 deb https://debian.ethz.ch/debian {{ ansible_distribution_release }} main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n' -}}
 deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }} main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n\n' -}}
 
 {%- if base__pkg_security | bool -%}
 # Inofficial Debian Security Mirror
+{% if ansible_distribution_major_version >= '11' -%}
 deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-security main
-  {%- if base__pkg_contrib | bool -%}
+{% else -%}
+deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
+{%- endif -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n' -}}
+{% if ansible_distribution_major_version >= '11' -%}
 deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-security main
-  {%- if base__pkg_contrib | bool -%}
+{% else -%}
+deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
+{%- endif -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n\n' -}}
 {%- endif -%}
@@ -55,25 +63,25 @@ deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}-secu
 {%- if base__pkg_updates -%}
 # {{ ansible_distribution_release }}-updates, previously known as 'volatile'
 deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n' -}}
 deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n\n' -}}
 {%- endif -%}
@@ -81,25 +89,25 @@ deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates
 {%- if base__pkg_backports -%}
 # {{ ansible_distribution_release }}-backports
 deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n' -}}
 deb-src https://debian.ethz.ch/debian {{ ansible_distribution_release }}-backports main
-  {%- if base__pkg_contrib | bool -%}
+  {%- if l3d_pkgs__ethz_contrib | bool -%}
     {{- ' contrib' -}}
   {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
+  {%- if l3d_pkgs__ethz_non_free | bool -%}
     {{- ' non-free' -}}
-    {%- if ansible_distribution_major_version >= '12' -%}
-      {{- ' non-free-firmware' -}}
   {%- endif -%}
+  {%- if ansible_distribution_major_version >= '12' and l3d_pkgs__ethz_non_free_firmware | bool -%}
+    {{- ' non-free-firmware' -}}
   {%- endif -%}
   {{- '\n\n' -}}
 {%- endif -%}

templates/apt.sources.list_legacy.j2

@@ -1,84 +0,0 @@
-# Debian mirror der ETH Zürich
-# https://debian.ethz.ch/
-
-# HTTPS mirror:
-deb https://debian.ethz.ch/debian {{ ansible_distribution_release }} 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 }} main
-  {%- if base__pkg_contrib | bool -%}
-    {{- ' contrib' -}}
-  {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
-    {{- ' non-free' -}}
-  {%- endif -%}
-  {{- '\n\n' -}}
-
-{%- if base__pkg_security | bool -%}
-# Inofficial Security Mirror
-deb https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
-  {%- if base__pkg_contrib | bool -%}
-    {{- ' contrib' -}}
-  {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
-    {{- ' non-free' -}}
-  {%- endif -%}
-  {{- '\n' -}}
-deb-src https://security.debian.ethz.ch/ {{ ansible_distribution_release }}/updates main
-  {%- if base__pkg_contrib | bool -%}
-    {{- ' contrib' -}}
-  {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
-    {{- ' non-free' -}}
-  {%- endif -%}
-  {{- '\n\n' -}}
-{%- endif -%}
-
-{%- if base__pkg_updates -%}
-# {{ ansible_distribution_release }}-updates, previously known as 'volatile'
-deb https://debian.ethz.ch/debian {{ ansible_distribution_release }}-updates 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 }}-updates main
-  {%- if base__pkg_contrib | bool -%}
-    {{- ' contrib' -}}
-  {%- endif -%}
-  {%- if base__pkg_non_free_firmware | bool -%}
-    {{- ' non-free' -}}
-  {%- endif -%}
-  {{- '\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

@@ -50,5 +50,5 @@ l3d_pkgs__cli:
   - bzip2
   - jq
 
-playbook_version_number: 5
+playbook_version_number: 6
 playbook_version_path: 'l3d.base.packages.version'