diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 15:29:56 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 15:29:56 -0200 |
commit | 0cff2c8111f03221f041bf86684937efb8867fe4 (patch) | |
tree | 57a4a73592a2efec98b1745d1969802d80b8c5c1 /manifests/subsystems/database.pp | |
parent | f24585f59eedc3159a3e566edd4828093b084f77 (diff) | |
download | puppet-nodo-0cff2c8111f03221f041bf86684937efb8867fe4.tar.gz puppet-nodo-0cff2c8111f03221f041bf86684937efb8867fe4.tar.bz2 |
Make custom_key_dir a class parameter and not a global variable; misc database updates; adding default exec and fileserver config
Diffstat (limited to 'manifests/subsystems/database.pp')
-rw-r--r-- | manifests/subsystems/database.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/subsystems/database.pp b/manifests/subsystems/database.pp index d9e379c..5796e9c 100644 --- a/manifests/subsystems/database.pp +++ b/manifests/subsystems/database.pp @@ -31,21 +31,21 @@ class database { define instance($password, $ensure = 'present', $privileges = all) { include mysql::server - mysql_database { "$name": + mysql_database { "${name}": ensure => $ensure, require => Service['mysql'], } - mysql_user { "$name@%": + mysql_user { "${name}@%": ensure => $ensure, password_hash => mysql_password($password), - require => Mysql_database["$name"], + require => Mysql_database["${name}"], } if $ensure == 'present' { - mysql_grant { "$name@%/$name": + mysql_grant { "${name}@%/${name}": privileges => $privileges, - require => Mysql_user["$name@%"], + require => Mysql_user["${name}@%"], } } } |