Merge branch 'master' of ssh://git-ssh.notandy.de:2222/ansible/roles/basic_tools

defaults/main.yml

@@ -8,7 +8,7 @@ default_repos:
       security:
         url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free"
       backports:
-        url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
+        url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free"
     bullseye: *debian_default_repos
     buster:
       debian:
@@ -18,6 +18,55 @@ default_repos:
       security:
         url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free"
       backports:
-        url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
-
+        url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main contrib non-free"
+  raspbian:
+    bullseye: {}
+    buster: {}
 
+default_packages:
+  debian:
+    bullseye: &debian_packages
+      aptitude: {}
+      "apt-transport-https": {}
+      "libarchive-tools": {}
+      bzip2: {}
+      curl: {}
+      dnsutils: {}
+      file: {}
+      git: {}
+      haveged: {}
+      htop: {}
+      iftop: {}
+      iotop: {}
+      less: {}
+      "locales-all": {}
+      lsof: {}
+      mailutils: {}
+      members: {}
+      mksh: {}
+      "molly-guard": {}
+      mosh: {}
+      "mtr-tiny": {}
+      ncdu: {}
+      "ncurses-term": {}
+      "net-tools": {}
+      nmap: {}
+      pciutils: {}
+      pv: {}
+      python3: {}
+      rsync: {}
+      screen: {}
+      sshfs: {}
+      sudo: {}
+      sysstat: {}
+      tcpdump: {}
+      tmux: {}
+      tree: {}
+      unzip: {}
+      usbutils: {}
+      "vim": {}
+      vnstat: {}
+      "xz-utils": {}
+      zip: {}
+      zsh: {}
+    buster: *debian_packages

meta/main.yml

@@ -1,2 +0,0 @@
-dependencies:
-- { role: packages }

tasks/main.yml

@@ -1,4 +1,12 @@
 ---
+- name: install default packages and repos
+  include_role:
+    name: packages
+  vars:
+    packages:
+      pkg: "{{ default_packages[ansible_distribution|lower][ansible_distribution_release|lower] }}"
+      repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"
+
 - name: copy environment
   copy:
     src: dotfiles/environment
@@ -36,3 +44,8 @@
   community.general.alternatives:
     name: editor
     path: /usr/bin/vim.basic
+
+- name: remove /etc/apt/sources.list
+  file:
+    path: /etc/apt/sources.list
+    state: absent

vars/main.yml

@@ -1,44 +0,0 @@
-packages:
-  pkg:
-    aptitude: {}
-    "apt-transport-https": {}
-    "libarchive-tools": {}
-    bzip2: {}
-    curl: {}
-    dnsutils: {}
-    file: {}
-    git: {}
-    haveged: {}
-    htop: {}
-    iftop: {}
-    iotop: {}
-    less: {}
-    "locales-all": {}
-    lsof: {}
-    mailutils: {}
-    members: {}
-    mksh: {}
-    "molly-guard": {}
-    mosh: {}
-    "mtr-tiny": {}
-    ncdu: {}
-    "ncurses-term": {}
-    "net-tools": {}
-    nmap: {}
-    pciutils: {}
-    pv: {}
-    python3: {}
-    rsync: {}
-    screen: {}
-    sshfs: {}
-    sudo: {}
-    sysstat: {}
-    tcpdump: {}
-    tmux: {}
-    tree: {}
-    usbutils: {}
-    "vim": {}
-    vnstat: {}
-    "xz-utils": {}
-    zsh: {}
-  repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"