From 641d85c1990c9d74bf22104f71785961718c4a7b Mon Sep 17 00:00:00 2001
From: creme <creme@envs.net>
Date: Mon, 11 Nov 2024 06:43:17 +0100
Subject: [PATCH] install_pkg.sls: debian 11 needs to install 'python3-pip' to
 install 'saltext-apache' via 'pip'

---
 salt/freifunk/base/install_pkg.sls | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/salt/freifunk/base/install_pkg.sls b/salt/freifunk/base/install_pkg.sls
index c57ee0b0..e6c96553 100644
--- a/salt/freifunk/base/install_pkg.sls
+++ b/salt/freifunk/base/install_pkg.sls
@@ -12,12 +12,14 @@ install_pkg:
       - htop
       - screen
       - tmux
+      - byobu
       - rsync
       - most
       - nano
       - vim
       - less
       - at
+      - jq
 
       - gnupg
       - wget
@@ -30,8 +32,6 @@ install_pkg:
       - zip
       - unzip
       - gzip
-      {# purge old kernels #}
-      - byobu
 
       - net-tools
       - grepcidr
@@ -48,17 +48,21 @@ install_pkg:
       - mtr-tiny
       - bwm-ng
 
-      - jq
 
 {% if grains['os'] == 'Debian' %}
       - firmware-linux
+      - python-apt-common
+      - iptraf-ng
 {% elif grains['os'] == 'Ubuntu' %}
       - linux-firmware
       - software-properties-common
 {% endif %}
 
 
-{% if grains['os'] == 'Ubuntu' and grains['oscodename'] == 'focal' %}
+{% if grains['os'] == 'Debian' and grains['oscodename'] == 'bullseye' %}
+      - python3-pip
+
+{% elif grains['os'] == 'Ubuntu' and grains['oscodename'] == 'focal' %}
       - python-apt
       - python-pycurl
       - iptraf
@@ -73,8 +77,4 @@ install_pkg:
       - python3-pycurl
       - iptraf-ng
 
-{% elif grains['os'] == 'Debian' %}
-      - python-apt-common
-      - iptraf-ng
-
 {% endif %}