diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp index ebda924..277cf21 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp @@ -25,8 +25,15 @@ class soc::intelmq( # content => template('soc/sso/apache-groups.txt.erb') # } - package { 'sys-package-deps': - name => ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2', 'redict', ], + package { 'apache2': + ensure => 'latest', + } + + package { 'libapache2-mod-wsgi-py3': + esnure => 'latest', + } + + package { ['postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2', 'redict', ]: ensure => 'latest', } @@ -61,12 +68,13 @@ class soc::intelmq( service { 'apache2': ensure => 'running', enable => true, - require => Package['sys-package-deps'], + require => Package['apache2'], } exec { 'Enable Apache2 modules': command => 'a2enmod ssl wsgi proxy proxy_http header rewrite', creates => ['/etc/apache2/mods-enabled/ssl.load', '/etc/apache2/mods-enabled/wsgi.load', '/etc/apache2/mods-enabled/proxy.load', '/etc/apache2/mods-enabled/proxy_http.load', '/etc/apache2/mods-enabled/header.load', '/etc/apache2/mods-enabled/rewrite.load'], notify => Service['apache2'], + require => Package['libapache2-mod-wsgi-py3'], } }