From e6df10f8fb045b06d877c6a4a33f4008984a39bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Tue, 19 Nov 2024 12:21:16 +0100 Subject: [PATCH] DB-fixes. --- global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp | 2 +- .../modules/soc/{files => templates}/intelmq/setup-pgsql.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename global/overlay/etc/puppet/modules/soc/{files => templates}/intelmq/setup-pgsql.sh (85%) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp index 2feb10c..6390fc6 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp @@ -125,7 +125,7 @@ class soc::intelmq( file { '/opt/intelmq/install/setup-pgsql.sh': ensure => file, - content => file('soc/intelmq/setup-pgsql.sh'), + content => template('soc/intelmq/setup-pgsql.sh'), mode => '0500', } diff --git a/global/overlay/etc/puppet/modules/soc/files/intelmq/setup-pgsql.sh b/global/overlay/etc/puppet/modules/soc/templates/intelmq/setup-pgsql.sh similarity index 85% rename from global/overlay/etc/puppet/modules/soc/files/intelmq/setup-pgsql.sh rename to global/overlay/etc/puppet/modules/soc/templates/intelmq/setup-pgsql.sh index 40027a9..0da1294 100644 --- a/global/overlay/etc/puppet/modules/soc/files/intelmq/setup-pgsql.sh +++ b/global/overlay/etc/puppet/modules/soc/templates/intelmq/setup-pgsql.sh @@ -5,7 +5,7 @@ set -e cd /tmp 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; GRANT ALL PRIVILEGES ON DATABASE eventdb TO intelmq; \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 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 touch /opt/intelmq/.pgsql-installed