verglasz/soc-ops
0
0
Fork 0
forked from SUNET/soc-ops
Code Pull requests Activity

Fixes for fody.

Browse source
This commit is contained in:
Johan Björklund 2024-11-19 12:12:13 +01:00
parent 503e8bd695
commit fa9c66771f
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
global/overlay/etc/puppet/modules/soc/files/intelmq/install-intelmq.sh
View file

@ -20,7 +20,6 @@ PY_INTELMQ='intelmq intelmq-api intelmqmail intelmq-manager gunicorn certstream'
pip3 install $PY_INTELMQ pip3 install $PY_INTELMQ
pip3 install $PY_CERTBUND_CONTACT pip3 install $PY_CERTBUND_CONTACT
# Junk # Junk
mkdir /opt/intelmq/src mkdir /opt/intelmq/src
@ -36,7 +35,7 @@ for api in tickets_api checkticket_api session contactdb_api events_api; do
done done
sqlite3 /etc/intelmq/fody/fody-session.sqlite < /opt/intelmq/src/intelmq-fody-backend/config/fody-session.sql sqlite3 /etc/intelmq/fody/fody-session.sqlite < /opt/intelmq/src/intelmq-fody-backend/config/fody-session.sql
mkdir /opt/intelmq/www/fody mkdir /opt/intelmq/www/fody
( cd /opt/intelmq/src/intelmq-fody ; yarn build ; cd dist ; cp -r * /opt/intelmq/www/fody ) ( cd /opt/intelmq/src/intelmq-fody ; yarn ; yarn build ; cd dist ; cp -r * /opt/intelmq/www/fody )
cd cd
rm -rf /opt/intelmq/src rm -rf /opt/intelmq/src

10
global/overlay/etc/puppet/modules/soc/files/intelmq/setup-pgsql.sh
View file

@ -18,11 +18,11 @@ GRANT ALL PRIVILEGES ON DATABASE contactdb TO intelmq;
CREATE SCHEMA intelmq AUTHORIZATION intelmq; CREATE SCHEMA intelmq AUTHORIZATION intelmq;
EOSQL EOSQL
rm -f /tmp/initdb.sql rm -f /opt/intelmq/install/eventdb-initdb.sql
sudo -u intelmq /opt/intelmq/venv/bin/intelmq_psql_initdb sudo -u intelmq /opt/intelmq/venv/bin/intelmq_psql_initdb -o /opt/intelmq/install/eventdb-initdb.sql
sudo -u intelmq psql eventdb -f /tmp/initdb.sql sudo -u intelmq psql eventdb -f /opt/intelmq/install/eventdb-initdb.sql
rm -f /tmp/initdb.sql
sudo -u intelmq psql eventdb -f /opt/intelmq/install/eventdb-notifications.sql test -f /opt/intelmq/install/contactdb-initdb.sql && sudo -u intelmq psql contacdb -f /opt/intelmq/install/contactdb-initdb.sql
test -f /opt/intelmq/install/eventdb-notifications.sql && sudo -u intelmq psql eventdb -f /opt/intelmq/install/eventdb-notifications.sql
touch /opt/intelmq/.pgsql-installed touch /opt/intelmq/.pgsql-installed

4
global/overlay/etc/puppet/modules/soc/files/intelmq/usr-bin-intelmqctl Normal file
View file

@ -0,0 +1,4 @@
#!/bin/sh
sudo -u intelmq PATH=/opt/intelmq/venv/bin:/usr/local/bin:/usr/bin:/bin /opt/intelmq/venv/bin/intelmqctl $*

17
global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
View file

@ -72,10 +72,19 @@ class soc::intelmq(
creates => '/etc/apt/sources.list.d/nodesource.list', creates => '/etc/apt/sources.list.d/nodesource.list',
} }
package { ['postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2', 'redict', 'nodejs', 'yarn', ]: package { ['postgresql', 'python3-venv', 'python3-pip', 'python3-gpg', 'python3-psycopg2', 'redict', 'nodejs', ]:
ensure => 'latest', ensure => 'latest',
} }
package { ['cmdtest', ]:
ensure => 'absent',
}
exec { 'Install yarn from npm':
command => 'npm install --global yarn',
creates => '/usr/bin/yarn',
}
exec { 'Install IntelMQ venv': exec { 'Install IntelMQ venv':
command => 'sudo -u intelmq /usr/bin/python3 -m venv --system-site-packages /opt/intelmq/venv', command => 'sudo -u intelmq /usr/bin/python3 -m venv --system-site-packages /opt/intelmq/venv',
creates => '/opt/intelmq/venv', creates => '/opt/intelmq/venv',
@ -108,6 +117,12 @@ class soc::intelmq(
returns => ['0', '1',], returns => ['0', '1',],
} }
file { '/usr/bin/intelmqctl':
ensure => file,
mode => '0555',
content => file('soc/intelmq/usr-bin-intelmqctl'),
}
file { '/opt/intelmq/install/setup-pgsql.sh': file { '/opt/intelmq/install/setup-pgsql.sh':
ensure => file, ensure => file,
content => file('soc/intelmq/setup-pgsql.sh'), content => file('soc/intelmq/setup-pgsql.sh'),