diff options
| author | Antoine Beaupre <anarcat@koumbit.org> | 2008-12-06 19:36:54 -0500 |
|---|---|---|
| committer | Antoine Beaupre <anarcat@koumbit.org> | 2008-12-06 19:36:54 -0500 |
| commit | 37a6a9feb1a3674c9d7d8cea162acc253e035d56 (patch) | |
| tree | f02859e3c2023a9e7f7468dce72c2d51f4a67d99 | |
| parent | 4573647f6b6d477fd44191a252e4ee2fda1ae453 (diff) | |
allow disabling the configfile parameter completely, put it in the config file properly
| -rw-r--r-- | manifests/mysql.pp | 8 | ||||
| -rw-r--r-- | templates/mysql.conf.erb | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/manifests/mysql.pp b/manifests/mysql.pp index e7c0eb4..08af103 100644 --- a/manifests/mysql.pp +++ b/manifests/mysql.pp @@ -17,9 +17,15 @@ define backupninja::mysql( $order = 10, $ensure = present, $user = false, $dbusername = false, $dbpassword = false, $dbhost = 'localhost', $databases = 'all', $backupdir = false, $hotcopy = false, - $sqldump = false, $compress = false, $configfile = '/etc/mysql/debian.cnf', + $sqldump = false, $compress = false, $configfile = true, $vsname = false) { + + $real_config_file = $configfile ? { + true => "/etc/mysql/debian.cnf", + default => $configfile, + } + include backupninja::client file { "${backupninja::client::configdir}/${order}_${name}.mysql": ensure => $ensure, diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index 9d22ab0..14905fd 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -12,3 +12,7 @@ end -%> hotcopy = <%= hotcopy ? 'yes' : 'no' %> sqldump = <%= sqldump ? 'yes' : 'no' %> compress = <%= compress ? 'yes' : 'no' %> + +<% if real_configfile %> +configfile = <%= real_configfile %> +<% end %> |