diff options
| author | mh <mh@immerda.ch> | 2012-04-29 12:55:07 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-04-29 12:55:07 +0200 |
| commit | 1f0784b73e4c56c36ae07f4ce3275f5d53f10e04 (patch) | |
| tree | 346769520c6330f930da8bf32a77318cd4843eeb | |
| parent | 64e116cfb5a4247f2e763a3d26354099f3f66f27 (diff) | |
| parent | fb1ec5b77792f46d9ad4de7efcf1d0eb7a458282 (diff) | |
Merge remote-tracking branch 'laurantb/master'
Conflicts:
manifests/server/cron/backup.pp
| -rw-r--r-- | files/config/my.cnf.Debian | 2 | ||||
| -rw-r--r-- | manifests/server/cron/backup.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/files/config/my.cnf.Debian b/files/config/my.cnf.Debian index e2f1559..74ce554 100644 --- a/files/config/my.cnf.Debian +++ b/files/config/my.cnf.Debian @@ -90,7 +90,7 @@ max_binlog_size = 100M # * BerkeleyDB # # Using BerkeleyDB is now discouraged as its support will cease in 5.1.12. -skip-bdb +#skip-bdb # # * InnoDB # diff --git a/manifests/server/cron/backup.pp b/manifests/server/cron/backup.pp index 4b5c3e5..570e4c8 100644 --- a/manifests/server/cron/backup.pp +++ b/manifests/server/cron/backup.pp @@ -13,7 +13,7 @@ class mysql::server::cron::backup { } cron { 'mysql_backup_cron': - command => "/usr/bin/mysqldump --default-character-set=utf8 --all-databases --all --flush-logs --lock-tables --single-transaction | gzip > ${mysql_backup_dir}/mysqldump.sql.gz && chmod 600 ${mysql_backup_dir}/mysqldump.sql.gz", + command => "/usr/bin/mysqldump --default-character-set=utf8 --all-databases --create-options --flush-logs --lock-tables --single-transaction | gzip > ${real_mysql_backup_dir}/mysqldump.sql.gz && chmod 600 ${real_mysql_backup_dir}/mysqldump.sql.gz", user => 'root', minute => 0, hour => 1, |