remove $safe_grant
Now that the ruby can query permissions sanely, filtering 'all' is no longer necessary
This commit is contained in:
parent
4485dbb95f
commit
d0a5b1c534
1 changed files with 1 additions and 7 deletions
|
@ -38,12 +38,6 @@ define mysql::db (
|
||||||
$enforce_sql = false
|
$enforce_sql = false
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if $grant == 'all' {
|
|
||||||
$safe_grant = [ 'alter_priv', 'alter_routine_priv', 'create_priv', 'create_routine_priv', 'create_tmp_table_priv', 'create_view_priv', 'delete_priv', 'drop_priv', 'event_priv', 'execute_priv', 'grant_priv', 'index_priv', 'insert_priv', 'lock_tables_priv', 'references_priv', 'select_priv', 'show_view_priv', 'trigger_priv', 'update_priv']
|
|
||||||
} else {
|
|
||||||
$safe_grant = $grant
|
|
||||||
}
|
|
||||||
|
|
||||||
database { $name:
|
database { $name:
|
||||||
ensure => present,
|
ensure => present,
|
||||||
charset => $charset,
|
charset => $charset,
|
||||||
|
@ -59,7 +53,7 @@ define mysql::db (
|
||||||
}
|
}
|
||||||
|
|
||||||
database_grant { "${user}@${host}/${name}":
|
database_grant { "${user}@${host}/${name}":
|
||||||
privileges => $safe_grant,
|
privileges => $grant,
|
||||||
provider => 'mysql',
|
provider => 'mysql',
|
||||||
require => Database_user["${user}@${host}"],
|
require => Database_user["${user}@${host}"],
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue