remove $safe_grant

Now that the ruby can query permissions sanely, filtering 'all' is
no longer necessary
This commit is contained in:
Branan Purvine-Riley 2012-04-27 12:05:02 -07:00
parent 4485dbb95f
commit d0a5b1c534

View file

@ -38,12 +38,6 @@ define mysql::db (
$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:
ensure => present,
charset => $charset,
@ -59,7 +53,7 @@ define mysql::db (
}
database_grant { "${user}@${host}/${name}":
privileges => $safe_grant,
privileges => $grant,
provider => 'mysql',
require => Database_user["${user}@${host}"],
}