From a65c07778a9e4382f849c29ba927e273c6bd0a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 14 Nov 2024 12:16:26 +0100
Subject: [PATCH] More to install.

---
 .../puppet/modules/soc/manifests/intelmq.pp   | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index 4fb4ca0..ef24fdd 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -25,12 +25,13 @@ class soc::intelmq(
   #    content => template('soc/sso/apache-groups.txt.erb')
   #  }
 
-  package { ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2']:
+  package { ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2', 'redict', ]:
     ensure => 'latest',
   }
 
-  exec { 'sudo -u intelmq /usr/bin/python3 -m venv --system-site-packages /opt/intelmq/venv':
-    creates =>  '/opt/intelmq/venv',
+  exec { 'Install IntelMQ venv':
+    command => 'sudo -u intelmq /usr/bin/python3 -m venv --system-site-packages /opt/intelmq/venv',
+    creates => '/opt/intelmq/venv',
   }
 
   file { '/opt/intelmq/install-intelmq.sh':
@@ -39,11 +40,13 @@ class soc::intelmq(
     mode    => '0555',
   }
 
-  exec { 'sudo -u intelmq /opt/intelmq/install-intelmq.sh':
-    creates =>  '/opt/intelmq/.installed'
+  exec { 'Install IntelMQ':
+    command => 'sudo -u intelmq /opt/intelmq/install-intelmq.sh',
+    creates => '/opt/intelmq/.installed'
   }
 
-  exec { '/opt/intelmq/venv/bin/intelmqsetup --state-file /opt/intelmq/.setup_state':
+  exec { 'Run IntelMQ setup script':
+    command => '/opt/intelmq/venv/bin/intelmqsetup --state-file /opt/intelmq/.setup_state',
     creates => '/opt/intelmq/.setup_state',
     returns => ['0', '1',],
   }
@@ -54,4 +57,15 @@ class soc::intelmq(
     mode    => '0440',
   }
 
+  service { 'apache2':
+    ensure  => 'running',
+    enable  => true,
+    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'],
+  }
 }