From 1abb2e62f1dc2ac374403374e5bfd6511a12de03 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 3 Jun 2008 16:41:36 +0000
Subject: add vserver support to backupninja config add vsnames support to
 mysql config

---
 manifests/config.pp            | 3 ++-
 manifests/mysql.pp             | 3 ++-
 templates/backupninja.conf.erb | 1 +
 templates/mysql.conf.erb       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index e82ec4d..d530957 100644
--- 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 e285691..71cf5cb 100644
--- 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 7502a4c..1d3aeb8 100644
--- 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 a26976a..9d22ab0 100644
--- 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
-- 
cgit v1.2.3