Merge remote-tracking branch 'laurantb/master'

Conflicts:
	manifests/server/cron/backup.pp
This commit is contained in:
mh 2012-04-29 12:55:07 +02:00
commit 1f0784b73e
2 changed files with 2 additions and 2 deletions

View file

@ -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
#

View file

@ -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,