mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-29 16:54:04 +02:00
Don't use `UNDEF' default values
This commit is contained in:
parent
261a5dd43d
commit
8f23f61e00
@ -8,9 +8,15 @@ Exec { path => '/bin:/usr/bin:/sbin' }
|
||||
$icingaVersion = '1.11.2'
|
||||
$icinga2Version = '2.0.0'
|
||||
|
||||
mysql::database { 'icinga': }
|
||||
mysql::database { 'icinga':
|
||||
username => 'icinga',
|
||||
password => 'icinga',
|
||||
}
|
||||
|
||||
mysql::database { 'icinga2': }
|
||||
mysql::database { 'icinga2':
|
||||
username => 'icinga2',
|
||||
password => 'icinga2',
|
||||
}
|
||||
|
||||
exec{ 'create-pgsql-icinga-db':
|
||||
unless => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga\'" | grep -q 1',
|
||||
|
@ -1,23 +1,11 @@
|
||||
define mysql::database (
|
||||
$username = 'UNDEF',
|
||||
$password = 'UNDEF'
|
||||
) {
|
||||
define mysql::database ($username, $password) {
|
||||
include mysql
|
||||
|
||||
$user = $username ? {
|
||||
/UNDEF/ => $name,
|
||||
default => $username,
|
||||
}
|
||||
$pass = $password ? {
|
||||
/UNDEF/ => $user,
|
||||
default => $password,
|
||||
}
|
||||
|
||||
exec { "create-mysql-${name}-db":
|
||||
unless => "mysql -u${user} -p${pass} ${name}",
|
||||
unless => "mysql -u${username} -p${password} ${name}",
|
||||
command => "mysql -uroot -e \"CREATE DATABASE ${name}; \
|
||||
GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${user}@localhost \
|
||||
IDENTIFIED BY '${pass}';\"",
|
||||
GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${username}@localhost \
|
||||
IDENTIFIED BY '${password}';\"",
|
||||
require => Service['mysqld']
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user