Including mysql backup at database class; adding --single-transaction sql dump option...

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index c87d454cf2876f001284f5f44d44ab970335d66e..e7496c22ea4be7a1eca6e131a53bf2b6fc968d4c 100644 (file)
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -43,12 +43,6 @@ class nodo::desktop::webdev inherits nodo::desktop {
   include websites::dev
   include database
   include utils::web
-
-  backupninja::mysql { "all_databases":
-       backupdir => '/var/backups/mysql',
-       compress  => true,
-       sqldump   => true,
-  }
 }
 
 class nodo::desktop::dev {

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index 34fde339660d182390c5ba140f391f696b49833c..e088de17809ca5cfaa3380338fc47cdc15ae1f5c 100644 (file)
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -58,12 +58,6 @@ class nodo::laptop::webdev inherits nodo::laptop {
   include websites::dev
   include database
   include utils::web
-
-  backupninja::mysql { "all_databases":
-       backupdir => '/var/backups/mysql',
-       compress  => true,
-       sqldump   => true,
-  }
 }
 
 class nodo::laptop::dev {

diff --git a/manifests/mail.pp b/manifests/mail.pp
index c82aac64fef59599cf7f023beac324b986364de6..18a4a08a448f33f823aabadcfe71344b7cd4afd0 100644 (file)
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -17,8 +17,9 @@ class nodo::mail {
   include mail::system
 
   backupninja::mysql { "all_databases":
-       backupdir => '/var/backups/mysql',
-       compress  => true,
-       sqldump   => true,
+    backupdir      => '/var/backups/mysql',
+    compress       => true,
+    sqldump        => true,
+    sqldumpoptions => '--lock-tables --complete-insert --add-drop-table --quick --quote-names --single-transaction',
   }
 }

diff --git a/manifests/master.pp b/manifests/master.pp
index 79cfb7293ecb5d46ebe1a9b9a2ecbbe9e749f23f..3bf276cf774f2316818a2c356e5221a9221edd3e 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -61,12 +61,6 @@ class nodo::master {
     password => "$puppetmaster_db_password",
   }
 
-  backupninja::mysql { "all_databases":
-       backupdir => '/var/backups/mysql',
-       compress  => true,
-       sqldump   => true,
-  }
-
   # Used for trac dependency graphs
   package { "graphviz":
     ensure => present,

diff --git a/manifests/subsystems/database.pp b/manifests/subsystems/database.pp
index d205ad65f3ab7ee810a514cca1617f61a5038291..17500ff46374fb7b9cbd67479fa58f55893e7239 100644 (file)
--- a/manifests/subsystems/database.pp
+++ b/manifests/subsystems/database.pp
@@ -20,6 +20,13 @@ class database {
     notify  => Service['mysql'],
   }
 
+  backupninja::mysql { "all_databases":
+    backupdir      => '/var/backups/mysql',
+    compress       => true,
+    sqldump        => true,
+    sqldumpoptions => '--lock-tables --complete-insert --add-drop-table --quick --quote-names --single-transaction',
+  }
+
   # Database definitions
   define instance($password, $ensure = 'present', $privileges = 'all') {
     mysql_database { "$name":

diff --git a/manifests/web.pp b/manifests/web.pp
index caf031a73154fa078f0f0afd97aa5a08562f3589..ef05dbe93bdc5a2d50f61998f5799f2df8f13c71 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -24,10 +24,4 @@ class nodo::web inherits nodo::vserver {
   backupninja::svn { "svn":
     src => "/var/svn",
   }
-
-  backupninja::mysql { "all_databases":
-       backupdir => '/var/backups/mysql',
-       compress  => true,
-       sqldump   => true,
-  }
 }