From c45aa4aafd519189815ba78ee5c866a215434c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 14 Nov 2024 10:24:57 +0100
Subject: [PATCH] Bugfix

---
 .../soc/files/intelmq/install-intelmq.sh      |  27 ++++++++++++++++++
 .../modules/soc/manifests/.intelmq.pp.swp     | Bin 12288 -> 12288 bytes
 .../puppet/modules/soc/manifests/intelmq.pp   |  15 ++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh

diff --git a/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh b/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
new file mode 100644
index 0000000..fa8cb93
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Script to install IntelMQ
+#
+
+if [ "x$(whoami)" != "xintelmq" ]; then
+      echo "Exectuing as wrong user."
+      exit -1
+fi
+
+if ! test -f /opt/intelmq/venv/bin/activate; then
+        echo "Issues with venv."
+        exit -1
+else
+        source /opt/intelmq/venv/bin/activate
+fi
+
+PY_INTELMQ='intelmq intelmq-api intelmqmail intelmq-manager'
+PY_CERTBUND_CONTACT='intelmq-certbund-contact intelmq-fody-backend'
+
+
+pip3 install $PY_INTELMQ
+pip3 install $PY_CERTBUND_CONTACT
+# Due to Certbund contact overwrite files for some reason, reinstall intelmq
+pip3 install --force-reinstall intelmq
+
+touch /opt/intelmq/.installed
diff --git a/global/overlay/etc/puppet/modules/soc/manifests/.intelmq.pp.swp b/global/overlay/etc/puppet/modules/soc/manifests/.intelmq.pp.swp
index ff1bddc6783e107d6f80b6941b373273df9cf54d..5e81c42cc71337776cf0780b6c07a73661d05a74 100644
GIT binary patch
delta 452
zcmaLRF;Bu^5C-5Y=%57wF~%@`Au-iJDQXzR=%z-EtBXsaRA^G#YRf<jfkg*5?cfh^
zWzlZN#b2O{i4G1L2NyAh%|+h=n~7iY<jY;|-dsy=$%$fiXJeZ!X66VlN~GN8%Gd2p
zGDj~Hcfr&9VXqTRhB(oSMZ1ykBv14T{-o%}*iy4QM)V0Ccz_$YfD<@|BiMyi7=ZwA
z&<GQ$PyiVM@Ejs~f=6h>ImoaD>#zpn@Qw@K`j-Uhh4;9j3Er)x;%8!v&uE726m(rJ
z3GP)Y+3XdfW;m)|-Otz+Ay33u0~o8CCDs3zS6DWe%caRL6ce+C<2Uy-U7ZnZQ;`Py
z`2Xb1_SaOyt{ot4u;w@Y^=Wp<1j)3V|043<M>@{M(@e1HPQ^49M9Z!#rd6JIf5h)8
XyQ1p4e_AhHkcyfi6$^I7jYwa=WA=3@

delta 545
zcmZ|K%}WA76aersmB4QiA`D{CgF?GnM9>Fy4TG-T0>|B18`N3boi!pvZy5z0_7CXP
zrCV&r=-4$n*)8Y~utYj^iJmP<1`Yg}uQ%__YZu$aWNCh<u#H!83kXIGq1l_I^8LjY
zdY-&aK6w3>(Bx&O=S_t?StlMFM8l5(gieBPaMq6FwbpwCp+0y6U2q33!5Qd)W3UT0
zK@j+W7uaEhj=%wEfN3xYA@mA*;1)Pg=^UJbVbu<>z^~y%d{+VcWiBz%Y}!v!+E0a&
zk?gpXY6)7c?dKbmH}WOM^L18V#EhGQRI4z5-~P-psk6~qp@t|~T$L4_3!;dBFUDW(
zQKcf7QlY{<Z@DF83O^9$SgfY2hjNKPELTU_YlM?BHAZ`rnkLivXz%78OH?DQnps5{
zr*Yv=V}#GBc-U!8Hw89@rD>QLI<$qE$T?jp;jusEkEyz$H<$`#F<#%m8Ox*wQB^yd
G?|%VdT%_>;

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index b871f61..10bcb59 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -11,7 +11,7 @@ class soc::intelmq(
     groups     => 'www-data',
     home       => '/opt/intelmq',
     managehome => true,
-    provider   => 'useradd',
+    shell      => '/bin/bash',
   }
 
   file { '/etc/intelmq':
@@ -25,7 +25,7 @@ class soc::intelmq(
   #    content => template('soc/sso/apache-groups.txt.erb')
   #  }
 
-  package { ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-venv', 'python3-pip', 'python3-gpg']:
+  package { ['apache2', 'libapache2-mod-wsgi-py3', 'postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2']:
     ensure => 'latest',
   }
 
@@ -33,8 +33,13 @@ class soc::intelmq(
     creates =>  '/opt/intelmq/venv',
   }
 
-  # Install intelmq and all most stuff around it.
-  exec { 'sudo -u intelmq /opt/intelmq/venv/bin/pip3 install intelmq intelmq-api intelmq-certbund-contact intelmq-certbund-contact-api intelmq-checkticket-api intelmq-events-api intelmq-fody-backend intelmq-manager intelmq-session intelmq-tickets-api intelmqmail':
-    creates =>  '/opt/intelmq/etc',
+  file { '/opt/intelmq/install-intelmq.sh':
+    ensure  => file,
+    content => file('soc/intelmq/install-intelmq.sh'),
+    mode    => 0555,
+  }
+
+  exec { 'sudo -u intelmq /opt/install-intelmq.sh':
+    creates =>  '/opt/intelmq/.installed'
   }
 }