allow disabling the configfile parameter completely, put it in the config file properly

diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index e7c0eb42a9ed2cf3161dee41d806f421c2009216..08af103715efd5400c22e58f526c10f5d463e2d5 100644 (file)
--- 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 9d22ab01ecc4cca8c053a6105712c1d59bca2986..14905fd4e5795fa2ab35ac14934db456535470cb 100644 (file)
--- 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 %>