tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up `pgsql::database' 

refs #6842
This commit is contained in:
Alexander Klimov 2014-08-28 14:24:18 +02:00
parent 5f977328a9
commit 4dc1541459
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.vagrant-puppet/modules/pgsql/manifests/database.pp
View File

@ -6,13 +6,11 @@ define pgsql::database::create ($username, $password) {
command => "sudo -u postgres psql -c \"CREATE ROLE ${username} WITH LOGIN PASSWORD '${password}';\" && \ command => "sudo -u postgres psql -c \"CREATE ROLE ${username} WITH LOGIN PASSWORD '${password}';\" && \
sudo -u postgres createdb -O ${username} -E UTF8 -T template0 ${name} && \ sudo -u postgres createdb -O ${username} -E UTF8 -T template0 ${name} && \
sudo -u postgres createlang plpgsql ${name}", sudo -u postgres createlang plpgsql ${name}",
require => Service['postgresql'] require => Class['pgsql']
} }
} }
define pgsql::database::populate ($username, $password, $schemafile, $requirement) { define pgsql::database::populate ($username, $password, $schemafile) {
include pgsql
pgsql::database::create { $name: pgsql::database::create { $name:
username => $username, username => $username,
password => $password, password => $password,
@ -21,6 +19,6 @@ define pgsql::database::populate ($username, $password, $schemafile, $requiremen
exec { "populate-${name}-pgsql-db": exec { "populate-${name}-pgsql-db":
unless => "psql -U ${username} -d ${name} -c \"SELECT * FROM icinga_dbversion;\" &> /dev/null", unless => "psql -U ${username} -d ${name} -c \"SELECT * FROM icinga_dbversion;\" &> /dev/null",
command => "sudo -u postgres psql -U ${username} -d ${name} < ${schemafile}", command => "sudo -u postgres psql -U ${username} -d ${name} < ${schemafile}",
require => [ $requirement, Exec["create-pgsql-${name}-db"] ] require => Pgsql::Database::Create[$name],
} }
} }

2
.vagrant-puppet/modules/profile/manifests/icinga-pgsql.pp
View File

@ -63,6 +63,6 @@ class profile::icinga-pgsql ($icingaVersion) {
username => 'icinga', username => 'icinga',
password => 'icingaweb', password => 'icingaweb',
schemafile => "/usr/local/src/icinga-pgsql/icinga-${icingaVersion}/module/idoutils/db/pgsql/pgsql.sql", schemafile => "/usr/local/src/icinga-pgsql/icinga-${icingaVersion}/module/idoutils/db/pgsql/pgsql.sql",
requirement => Cmmi['icinga-pgsql'], require => Cmmi['icinga-pgsql'],
} }
} }