aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-06-03 16:41:36 +0000
committerMicah Anderson <micah@riseup.net>2008-06-03 16:41:36 +0000
commit1abb2e62f1dc2ac374403374e5bfd6511a12de03 (patch)
tree795f9447513f882f49d1eabf049feb679f1fd761
parent593f7985dd71b90d6d0624b29dae18d74f37ef2c (diff)
downloadpuppet-backupninja-1abb2e62f1dc2ac374403374e5bfd6511a12de03.tar.gz
puppet-backupninja-1abb2e62f1dc2ac374403374e5bfd6511a12de03.tar.bz2
add vserver support to backupninja config
add vsnames support to mysql config
-rw-r--r--manifests/config.pp3
-rw-r--r--manifests/mysql.pp3
-rw-r--r--templates/backupninja.conf.erb1
-rw-r--r--templates/mysql.conf.erb2
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