diff --git a/manifests/backup.pp b/manifests/backup.pp index e4b0cb1..94139f2 100644 --- a/manifests/backup.pp +++ b/manifests/backup.pp @@ -22,16 +22,12 @@ # } # class mysql::backup ( - $ensure = 'present', - $backupuser = $mysql::params::backupuser, - $backuppassword = $mysql::params::backuppassword, - $backupdir = $mysql::params::backupdir + $backupuser, + $backuppassword, + $backupdir, + $ensure = 'present' ) { - if $backupuser == 'UNSET' or $backupdir == 'UNSET' or $backuppassword == 'UNSET' { - fail('mysql::backup - You must specify a backup user, password, and target directory.') - } - database_user { "${backupuser}@localhost": ensure => $ensure, password_hash => mysql_password($backuppassword), diff --git a/manifests/params.pp b/manifests/params.pp index f6940c2..9c732ec 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -21,9 +21,6 @@ class mysql::params { $ssl_ca = '/etc/mysql/cacert.pem' $ssl_cert = '/etc/mysql/server-cert.pem' $ssl_key = '/etc/mysql/server-key.pem' - $backupuser = 'UNSET' - $backuppassword = 'UNSET' - $backupdir = 'UNSET' case $::operatingsystem { "Ubuntu": {