mysql --defaults-file stuff.

This commit is contained in:
Elijah Saxon 2005-06-01 22:44:04 +00:00
parent e2089c77cb
commit 1b3449f24c
4 changed files with 83 additions and 42 deletions

View File

@ -3,7 +3,7 @@
# B A C K U P N I N J A /()/
# `\|
#
# Copyright (C) 2004 riseup.net -- property is theft.
# Copyright (C) 2004-05 riseup.net -- property is theft.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -429,7 +429,7 @@ getconf RSYNC /usr/bin/rsync
getconf vservers no
getconf VSERVERINFO /usr/sbin/vserver-info
getconf VSERVER /usr/sbin/vserver
getconf VROOTDIR `$VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'`
getconf VROOTDIR `if [ -f "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'; fi`
if [ ! -d "$configdirectory" ]; then
echo "Configuration directory '$configdirectory' not found."
@ -443,8 +443,8 @@ if [ "$UID" != "0" ]; then
exit 1
fi
if [ "$VSERVERS" = "yes" -a ! -d $VROOTDIR ]; then
echo "vservers option set in config, but $VROOTDIR is not a directory!"
if [ "$vservers" == "yes" -a ! -d "$VROOTDIR" ]; then
echo "vservers option set in config, but $VROOTDIR is not a directory!"
fatal "vservers option set in config, but $VROOTDIR is not a directory!"
fi

View File

@ -17,9 +17,9 @@ version 0.x -- xxxxxxxxxxxxx
added "bandwidthlimit" option
example.dup example config file for duplicity handler
added trac (http://trac.edgewall.com/) environment handler (thanks Charles Lepple!)
added configfile option to mysql handler (thanks bonniot!)
uses /etc/mysql/debian.cnf by default
now, an empty /etc/backup.d/01.mysql file is all you need
added configfile option to mysql handler
the default is /etc/mysql/debian.cnf. with this,
sqldump doesn't need dbusername. (hotcopy still does).
version 0.5 -- April 12 2005
rdiff handler works when remote sshd has a banner

View File

@ -1,24 +1,31 @@
## backupninja mysql config file ##
### backupninja mysql config file ###
dbhost = localhost
databases = all
backupdir = /var/backups/mysql
hotcopy = yes
sqldump = no
hotcopy = no
sqldump = yes
compress = yes
## authentication ##
### authentication ###
configfile = /etc/mysql/debian.cnf
# three authentication methods:
#
# 1. setting the user, so that /home/user/.my.cnf is used.
# user = some-unix-user
#
# 2. specifying the mysql dbuser and dbpassword,
# which generates a temporary .my.cnf in /root/.my.cnf
# dbusername = <some-mysql-user>
# dbpassword = <password>
#
# 3. specify which config file to use with configfile
# (this option does not work with hotcopy)
# configfile = /etc/mysql/debian.cnf
#
# if user and dbusername are not specified, the default is to use
# /etc/mysql/debian.cnf for configfile.
# or...
# dbusername = <dbuser>
# dbpassword = <dbpassword>
# or...
# user = root
## notes ##
### all options ###
# configfile = < path/to/file > (default = /etc/mysql/debian.cnf)
# The config file is passed to mysql with --defaults-file.
@ -50,7 +57,7 @@ configfile = /etc/mysql/debian.cnf
# where to dump the backups. hotcopy backups will be in a subdirectory 'hotcopy' and
# sqldump backups will be in a subdirectory 'sqldump'
#
# hotcopy = < yes | no > (default = yes)
# hotcopy = < yes | no > (default = no)
# make a backup of the actual database binary files using mysqlhotcopy.
#
# sqldump = < yes | no > (default = no)

View File

@ -3,16 +3,27 @@
#
getconf backupdir /var/backups/mysql
getconf configfile /etc/mysql/debian.cnf
getconf databases all
getconf dbhost localhost
getconf hotcopy no
getconf sqldump no
getconf compress yes
getconf vsname
# authentication:
getconf user
getconf dbusername
getconf dbpassword
getconf dbhost localhost
getconf hotcopy yes
getconf sqldump no
getconf user root
getconf vsname
getconf configfile /etc/mysql/debian.cnf
if [ "$user" == "" ]; then
userset=false;
user=root;
else
userset=true;
userhome=`grep "^$user:" /etc/passwd | awk -F: '{print $6}'`
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
fi
# If vservers are configured, decide if the handler should
# use them or if it should just operate on the host
@ -51,17 +62,33 @@ else
[ "$hotcopy" == "no" -o -d $hotdir ] || mkdir -p $hotdir
fi
#######################################################################
## AUTHENTICATION
#
# one of three authentication methods:
# 1. setting the user, so that /home/user/.my.cnf is used.
# 2. specifying the user and password in the handler config,
# which generates a temporary .my.cnf in /root/.my.cnf
# 3. specify the config file with --defaults-file
# (this option DOESN'T WORK WITH MYSQLHOTCOPY)
#
# create .my.cnf
# only if dbusername and dbpassword specified.
# we create a tmp file because we don't want to have to
# we create a tmp file because we don't want to
# specify the password on the command line.
defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
mycnf="/tmp/backupninja.$$.my.cnf"
home=`grep '^root:' /etc/passwd | awk -F: '{print $6}'`
[ -d $home ] || fatal "Can't find root's home directory ($home)."
mycnf="$home/.my.cnf"
if [ -f $mycnf ]; then
debug "rm $mycnf"
rm $mycnf
# rename temporarily
tmpcnf="$home/my.cnf.disable"
debug "mv $mycnf $tmpcnf"
mv $mycnf $tmpcnf
fi
oldmask=`umask`
umask 077
@ -80,21 +107,22 @@ user=$dbusername
password=$dbpassword
EOF
umask $oldmask
defaultsfile="--defaults-file $mycnf"
else
# otherwise, use $configfile
defaultsfile="--defaults-file $configfile"
defaultsfile="--defaults-file=$mycnf"
elif [ "$userset" == "false" ]; then
# if user is set, don't use $configfile
defaultsfile="--defaults-file=$configfile"
fi
#######################################################################
## HOT COPY
if [ "$hotcopy" == "yes" ]; then
if [ "$databases" == "all" ]; then
if [ $usevserver ]
then
execstr="$VSERVER $vsname exec $MYSQLHOTCOPY $defaultsfile --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
else
execstr="$MYSQLHOTCOPY $defaultsfile --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
fi
debug "su $user -c '$execstr'"
if [ ! $test ]; then
@ -112,9 +140,9 @@ if [ "$hotcopy" == "yes" ]; then
for db in $databases; do
if [ $usevserver ]
then
execstr="$VSERVER $vsname exec $MYSQLHOTCOPY $defaultsfile --allowold $db $hotdir"
execstr="$VSERVER $vsname exec $MYSQLHOTCOPY --allowold $db $hotdir"
else
execstr="$MYSQLHOTCOPY $defaultsfile --allowold $db $hotdir"
execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
fi
debug "su $user -c '$execstr'"
if [ ! $test ]; then
@ -131,7 +159,8 @@ if [ "$hotcopy" == "yes" ]; then
done
fi
fi
##########################################################################
## SQL DUMP
if [ "$sqldump" == "yes" ]; then
@ -172,9 +201,14 @@ if [ "$sqldump" == "yes" ]; then
fi
# clean up tmp config file
if [ -f "$mycnf" ]; then
if [ "$dbusername" != "" ]; then
## clean up tmp config file
debug "rm $mycnf"
rm $mycnf
if [ -f "$tmpcnf" ]; then
debug "mv $tmpcnf $mycnf"
mv $tmpcnf $mycnf
fi
fi
return 0