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

DB-fixes.

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

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

@ -125,7 +125,7 @@ class soc::intelmq(
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 => template('soc/intelmq/setup-pgsql.sh'),
mode => '0500', mode => '0500',
} }

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

@ -5,7 +5,7 @@ set -e
cd /tmp cd /tmp
sudo -u postgres psql <<-EOSQL sudo -u postgres psql <<-EOSQL
CREATE USER intelmq WITH NOSUPERUSER NOCREATEDB ENCRYPTED PASSWORD 'intelmq'; CREATE USER <%= @db_user %> WITH NOSUPERUSER NOCREATEDB ENCRYPTED PASSWORD '<%= @db_pass %>';
CREATE DATABASE eventdb WITH OWNER intelmq ENCODING UTF8; CREATE DATABASE eventdb WITH OWNER intelmq ENCODING UTF8;
GRANT ALL PRIVILEGES ON DATABASE eventdb TO intelmq; GRANT ALL PRIVILEGES ON DATABASE eventdb TO intelmq;
\c eventdb; \c eventdb;
@ -22,7 +22,7 @@ rm -f /opt/intelmq/install/eventdb-initdb.sql
sudo -u intelmq /opt/intelmq/venv/bin/intelmq_psql_initdb -o /opt/intelmq/install/eventdb-initdb.sql sudo -u intelmq /opt/intelmq/venv/bin/intelmq_psql_initdb -o /opt/intelmq/install/eventdb-initdb.sql
sudo -u intelmq psql eventdb -f /opt/intelmq/install/eventdb-initdb.sql sudo -u intelmq psql eventdb -f /opt/intelmq/install/eventdb-initdb.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/contactdb-initdb.sql && sudo -u intelmq psql contactdb -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 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