From ace32b050e74888d7e18995a2d1f499a5efdb322 Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Mon, 14 Oct 2024 05:35:04 +0000 Subject: [PATCH] Fix path to reporting db schema --- data/common.yaml | 4 ++-- spec/classes/modules/reporting_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/common.yaml b/data/common.yaml index 7dbc5504..6e4a5dc7 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -59,8 +59,8 @@ icingaweb2::module::director::db_host: localhost icingaweb2::module::director::db_name: director icingaweb2::module::director::db_username: director -icingaweb2::globals::mysql_reporting_schema: /schema/mysql.sql -icingaweb2::globals::pgsql_reporting_schema: /schema/postgresql.sql +icingaweb2::globals::mysql_reporting_schema: /schema/mysql.schema.sql +icingaweb2::globals::pgsql_reporting_schema: /schema/pgsql.schema.sql icingaweb2::module::reporting::ensure: present icingaweb2::module::reporting::install_method: git icingaweb2::module::reporting::git_repository: https://github.com/Icinga/icingaweb2-module-reporting.git diff --git a/spec/classes/modules/reporting_spec.rb b/spec/classes/modules/reporting_spec.rb index 3f328ad0..9005b08f 100644 --- a/spec/classes/modules/reporting_spec.rb +++ b/spec/classes/modules/reporting_spec.rb @@ -106,7 +106,7 @@ it { is_expected.to contain_exec('import icingaweb2::module::reporting schema') - .with_command(%r{^mysql.*\< '/usr/share/icingaweb2/modules/reporting/schema/mysql.sql'$}) + .with_command(%r{^mysql.*\< '/usr/share/icingaweb2/modules/reporting/schema/mysql.schema.sql'$}) .with_unless(%r{^mysql.* -Ns -e 'SELECT \* FROM report'$}) } @@ -204,7 +204,7 @@ it { is_expected.to contain_exec('import icingaweb2::module::reporting schema') .with_environment(['PGPASSWORD=foo']) - .with_command(%r{^psql.*-w -f /usr/share/icingaweb2/modules/reporting/schema/postgresql.sql$}) + .with_command(%r{^psql.*-w -f /usr/share/icingaweb2/modules/reporting/schema/pgsql.schema.sql$}) .with_unless(%r{^psql.*-w -c 'SELECT \* FROM report'$}) }