add vserver support to backupninja config

add vsnames support to mysql config

diff --git a/manifests/config.pp b/manifests/config.pp
index e82ec4d75040ff0e2ac19e235eeb9d4af4ba27e5..d530957a89fa31279d8dddfbbf4802d1b0267803 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -15,7 +15,8 @@ define backupninja::config($configfile = '/etc/backupninja.conf',
                             $configdir = '/etc/backup.d',
                             $scriptdir = '/usr/share/backupninja',
                             $libdir = '/usr/lib/backupninja',
-                            $usecolors = true
+                            $usecolors = true,
+                            $vserver = false
              ) {
        file { $configfile:
                content => template('backupninja/backupninja.conf.erb'),

diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index e2856919ddf70399b8b5dd8fda0af220c198f9b9..71cf5cbca57e4e64b9e1261dac9de3e6ccc889bd 100644 (file)
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -25,7 +25,8 @@ define backupninja::mysql($order = 10,
                            $hotcopy = false,
                            $sqldump = false,
                            $compress = false,
-                           $configfile = '/etc/mysql/debian.cnf'
+                           $configfile = '/etc/mysql/debian.cnf',
+                           $vserver = false
                           ) {
                           include backupninja::client
        file { "${backupninja::client::configdir}/${order}_${name}.mysql":

diff --git a/templates/backupninja.conf.erb b/templates/backupninja.conf.erb
index 7502a4c7b1bf5f2319ca7a7e9697a2a3c25095a2..1d3aeb8c42c6e56cec6ef56e6af7016f80e3eb86 100644 (file)
--- a/templates/backupninja.conf.erb
+++ b/templates/backupninja.conf.erb
@@ -16,3 +16,4 @@ configdirectory = <%= configdir %>
 scriptdirectory = <%= scriptdir %>
 libdirectory = <%= libdir %>
 usecolors = <%= usecolors ? 'yes' : 'no' %>
+vserver = <%= vserver ? 'yes' : 'no' %>

diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb
index a26976a6bda5043b05b0ea175a912989a36bb17c..9d22ab01ecc4cca8c053a6105712c1d59bca2986 100644 (file)
--- a/templates/mysql.conf.erb
+++ b/templates/mysql.conf.erb
@@ -3,7 +3,7 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% %w{user dbusername dbpassword dbhost databases backupdir}.each do |v|
+<% %w{user dbusername dbpassword dbhost databases backupdir vsname}.each do |v|
        if send(v)
                -%><%= v + ' = ' + send(v) + "\n" %><%
        end