diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2015-03-06 17:47:09 -0500 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2015-03-06 17:47:09 -0500 |
| commit | b2c9640c654b0d9ba2f5949ef53480c855a6d1f0 (patch) | |
| tree | 37611e2ca83b20f594ea2d3cbf1316c91437c738 /manifests/mysql.pp | |
| parent | 21d8dc8652a9e8910914940cc439e7a02efbf39e (diff) | |
| parent | aaa21c19b69d381becc1d801d6664b71ba0db525 (diff) | |
| download | puppet-backupninja-b2c9640c654b0d9ba2f5949ef53480c855a6d1f0.tar.gz puppet-backupninja-b2c9640c654b0d9ba2f5949ef53480c855a6d1f0.tar.bz2 | |
Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst
Conflicts:
manifests/mysql.pp
manifests/pgsql.pp
templates/pgsql.conf.erb
Diffstat (limited to 'manifests/mysql.pp')
| -rw-r--r-- | manifests/mysql.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/mysql.pp b/manifests/mysql.pp index ee2e71d..8e33e8e 100644 --- a/manifests/mysql.pp +++ b/manifests/mysql.pp @@ -18,7 +18,8 @@ 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 = true, - $vsname = false, $sqldumpoptions = '--lock-tables --complete-insert --add-drop-table --quick --quote-names') + $vsname = false, $sqldumpoptions = '--lock-tables --complete-insert --add-drop-table --quick --quote-names', + $nodata = false) { $real_configfile = $configfile ? { |