Skip to content

Commit

Permalink
install_pkg.sls: debian 11 needs to install 'python3-pip' to install …
Browse files Browse the repository at this point in the history
…'saltext-apache' via 'pip'
  • Loading branch information
cremesk committed Nov 11, 2024
1 parent ea9d674 commit 641d85c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions salt/freifunk/base/install_pkg.sls
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ install_pkg:
- htop
- screen
- tmux
- byobu
- rsync
- most
- nano
- vim
- less
- at
- jq

- gnupg
- wget
Expand All @@ -30,8 +32,6 @@ install_pkg:
- zip
- unzip
- gzip
{# purge old kernels #}
- byobu

- net-tools
- grepcidr
Expand All @@ -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
Expand All @@ -73,8 +77,4 @@ install_pkg:
- python3-pycurl
- iptraf-ng

{% elif grains['os'] == 'Debian' %}
- python-apt-common
- iptraf-ng

{% endif %}

0 comments on commit 641d85c

Please sign in to comment.