diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp index 955abe0..09ad191 100644 --- a/modules/rhizo_base/manifests/packages.pp +++ b/modules/rhizo_base/manifests/packages.pp @@ -34,8 +34,8 @@ class rhizo_base::packages::common { 'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'tinc', 'rrdtool', 'dnsmasq', 'joe', 'htop', 'iperf3', 'iftop', 'websocketd', 'fping', 'mtr-tiny', 'openssh-server', 'telnet', 'netcat-traditional', - 'apache2','libapache2-mod-php', 'php', 'php-pgsql', 'php-curl', 'php-cli', 'php-gd', - 'php-intl', 'php-gettext']: + 'apache2', 'libapache2-mod-php7.3', 'php', 'php7.3-pgsql', 'php-curl', 'php-cli', 'php7.3-gd', + 'php7.3-intl', 'php-gettext']: ensure => installed, require => Class['rhizo_base::apt'], } @@ -68,6 +68,11 @@ class rhizo_base::packages::bullseye inherits rhizo_base::packages::common { class rhizo_base::packages::buster inherits rhizo_base::packages::common { + package { [ 'libapache2-mod-php7.0', ]: + ensure => absent, + require => Class['rhizo_base::apt'], + } + package { ['python-unidecode', 'python-dateutil', 'python-yaml', 'python-formencode', 'python-xmltodict', 'python-psycopg2', 'python-pysqlite2' ]: ensure => installed,