From edd8eced5d8746d4a25fb5dd91b4a2007709344a Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 25 Nov 2014 12:55:51 +0100 Subject: [PATCH] icingaweb2_dev: update SQL schema file paths --- .../profiles/icingaweb2_dev/manifests/init.pp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp index aa2d1317f..c65568993 100644 --- a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp +++ b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp @@ -60,26 +60,13 @@ class icingaweb2_dev { username => 'icingaweb', password => 'icingaweb', privileges => 'ALL', - schemafile => '/vagrant/etc/schema/accounts.mysql.sql', + schemafile => '/vagrant/etc/schema/mysql.schema.sql', } pgsql::database::populate { 'icingaweb': username => 'icingaweb', password => 'icingaweb', - schemafile => '/vagrant/etc/schema/accounts.pgsql.sql', - } - - exec { 'populate-icingaweb-mysql-db-preferences': - unless => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM preference;" &> /dev/null', - command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/preferences.mysql.sql', - require => Mysql::Database::Populate['icingaweb'], - } - - exec { 'populate-icingweb-pgsql-db-preferences': - unless => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM preference;" &> /dev/null', - command => 'psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/preferences.pgsql.sql', - user => 'postgres', - require => Pgsql::Database::Populate['icingaweb'], + schemafile => '/vagrant/etc/schema/pgsql.schema.sql', } file { '/etc/httpd/conf.d/icingaweb.conf':