projekty: server-backups/backup - correct
wolvverine
wolvverine at pld-linux.org
Wed Mar 15 21:56:56 CET 2006
Author: wolvverine Date: Wed Mar 15 20:56:56 2006 GMT
Module: projekty Tag: HEAD
---- Log message:
- correct
---- Files affected:
projekty/server-backups:
backup (1.9 -> 1.10)
---- Diffs:
================================================================
Index: projekty/server-backups/backup
diff -u projekty/server-backups/backup:1.9 projekty/server-backups/backup:1.10
--- projekty/server-backups/backup:1.9 Thu Mar 2 21:20:54 2006
+++ projekty/server-backups/backup Wed Mar 15 21:56:51 2006
@@ -12,8 +12,7 @@
# - remove bashizm
set -x
####################
- DIRSCRIPTS="/root/scripts" # TODO - remove this
- VARBACKDIR="/var/lib/backups"
+ DIRSCRIPTS=/root/scripts # TODO - remove this
DIRETC=/etc/backups
DATA=`date +%Y%m%d`
TIME=`date +%H%M`
@@ -26,7 +25,7 @@
MYSQLPASSWORD=''
PASSWD=''
DIRSTORHOST=backup
- NICELEVEL=19
+ NICELEVEL=10
ERROR=0
PROGMAIL="/bin/mail"
PROGTAR="/bin/tar"
@@ -42,19 +41,18 @@
#[! -f ${DIRETC}/exclude ]
mkdir -p $BCK_HOME/$DATA-$TIME ;
-mkdir -p ${VARBACKDIR};
touch /tmp/$DATA-$TIME-backup ;
#TODO - optional this
#obudzenie kompa skladujacego
MACSTORHOST=`arp -a $STORHOST | awk '{print $4};'`
-wakelan -b $BRODCASTIP -m $MACSTORHOST 2>/tmp/$DATA-$TIME-error
+wakelan -b $BRODCASTIP -m $MACSTORHOST > /tmp/$DATA-$TIME-error 2>&1
ERROR=$? ;
if [ ! ${ERROR} -eq 0 ];
then
- echo "backup error ${ERROR}- wake host - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error ;
- cat /tmp/$DATA-$TIME-error >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error | ${PROGMAIL} -s "backup error ${ERROR}- wake host - $DATA-$TIME !!!!" $RECIPIENT ;
+ echo "backup error ${ERROR}- wake host - $DATA-$TIME !!!!" >> "/tmp/$DATA-$TIME-backup-error"
+ "cat /tmp/$DATA-$TIME-error" >> "/tmp/$DATA-$TIME-backup-error"
+ "cat /tmp/$DATA-$TIME-error" | ${PROGMAIL} -s "backup error ${ERROR}- wake host - $DATA-$TIME !!!!" $RECIPIENT
fi
##################
# backup katalogow
@@ -62,54 +60,56 @@
while read BACKDIR;
do
NAMEDIR="${BACKDIR##*/}"
- nice -n $NICELEVEL ${PROGTAR} ${TAROPT} "${BCK_HOME}/${DATA}-${TIME}/${NAMEDIR}_${DATA}-${TIME}.tar.gz" -X "${EXCLUDEFILE}" "${BACKDIR}" 2>/tmp/$DATA-$TIME-error
+ nice -n $NICELEVEL ${PROGTAR} ${TAROPT} "${BCK_HOME}/${DATA}-${TIME}/${NAMEDIR}_${DATA}-${TIME}.tar.gz" -X "${EXCLUDEFILE}" "${BACKDIR}" > /tmp/$DATA-$TIME-error 2>&1
ERROR=$?;
if [ ! ${ERROR} -eq 0 ]; then
- echo "backup error ${ERROR}-${NAMEDIR}-tar.gz - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error | ${PROGMAIL} -s "backup error ${ERROR}-${NAMEDIR} - $DATA-$TIME !!!!" $RECIPIENT ;
+ echo "backup error ${ERROR}-${NAMEDIR}-tar.gz - $DATA-$TIME !!!!" >> "/tmp/$DATA-$TIME-backup-error"
+ cat "/tmp/$DATA-$TIME-error" >> "/tmp/$DATA-$TIME-backup-error"
+ cat "/tmp/$DATA-$TIME-error" | ${PROGMAIL} -s "backup error ${ERROR}-${NAMEDIR} - $DATA-$TIME !!!!" $RECIPIENT ;
fi
done < ${CONFBACKDIRFILE}
-ERROR=$?;
-if [ ! ${ERROR} -eq 0 ]; then
- cat /tmp/$DATA-$TIME-backup | ${PROGMAIL} -s "backup error ${ERROR} - $DATA-$TIME !!!!" $RECIPIENT ;
-fi
+#ERROR=$?;
+#if [ ! ${ERROR} -eq 0 ]; then
+# cat /tmp/$DATA-$TIME-backup | ${PROGMAIL} -s "backup error ${ERROR} - $DATA-$TIME !!!!" $RECIPIENT ;
+#fi
#########################################
-#BACKUP PODKATALOGOW katalogu wskazanego
+#BACKUP PODKATALOGOW katalogu wskazanego w pliku ${CONFBACKSUBDIRFILE} - kolejne linie pliku
#########################################
while read SUBDIRBCK;
do
+ #pobranie nazwy ostatniego katalogu ze sciezki w "${SUBDIRBCK"
DIRNAME="${SUBDIRBCK##*/}";
- find ${SUBDIRBCK} -maxdepth 1 -mindepth 1 -type d | while read SUBDIR;
- do
+ #pobranie podkatalogow katalogu "${SUBDIRBCK}" i umieszczenie ich w zmiennej ${SUBDIR}"
+ find "${SUBDIRBCK}" -maxdepth 1 -mindepth 1 -type d | while read SUBDIR ; do
# USERNAME=`echo $poddir | awk 'BEGIN { FS="/"} {print $NF}'`;
- SUBDIRNAME="${SUBDIR##*/}";
- nice -n $NICELEVEL ${PROGTAR} ${TAROPT} "${BCK_HOME}/${DATA}-${TIME}/${DIRNAME}_${SUBDIRNAME}_${DATA}-${TIME}.tar.gz" -X "${EXCLUDEFILE}" "${SUBDIR}" 2>/tmp/$DATA-$TIME-error
- ERROR=$?;
- if [ ! ${ERROR} -eq 0 ]; then
- echo "backup error ${ERROR} - ${DIRNAME} - ${SUBDIRNAME} - tar.gz - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error | ${PROGMAIL} -s "backup error ${ERROR} - ${DIRNAME} - ${SUBDIRNAME} - $DATA-$TIME !!!!" $RECIPIENT ;
+ SUBDIRNAME="${SUBDIR##*/}"
+ echo "${DIRNAME}_${SUBDIRNAME}" >> "/tmp/backup-log-$DATA-$TIME"
+ nice -n $NICELEVEL ${PROGTAR} ${TAROPT} "${BCK_HOME}/${DATA}-${TIME}/${DIRNAME}_${SUBDIRNAME}_${DATA}-${TIME}.tar.gz" -X "${EXCLUDEFILE}" "${SUBDIR}" >> "/tmp/backup-log-${DATA}-${TIME}" 2>&1
+ ERROR=$?
+ echo "${ERROR}" >> "/tmp/backup-log-${DATA}-${TIME}"
+ if [ ! "${ERROR}" -eq 0 ];
+ then
+ echo "backup error ${ERROR} - ${DIRNAME} - ${SUBDIRNAME} - tar.gz - ${DATA}-${TIME} !!!!" >> "/tmp/${DATA}-${TIME}-backup-error"
+ cat "/tmp/$DATA-$TIME-error" >> "/tmp/$DATA-$TIME-backup-error"
+ cat "/tmp/$DATA-$TIME-error" | ${PROGMAIL} -s "backup error ${ERROR} - ${DIRNAME} - ${SUBDIRNAME} - $DATA-$TIME !!!!" $RECIPIENT ;
fi
done
-done < ${CONFBACKSUBDIRFILE}
-
-
-ERROR=$?;
+#pobieranie kolejnych katalogow z pliku
+done < "${CONFBACKSUBDIRFILE}"
+#ERROR=$?;
#if [ ! ${ERROR} -eq 0 ]; then
-# echo "backup error ${ERROR} - ${DATA-$TIME} !!!!" >> /tmp/$DATA-$TIME-backup-error
+# echo "backup error ${ERROR} - tar.gz - ${DATA-$TIME} !!!!" >> /tmp/$DATA-$TIME-backup-error
# cat /tmp/$DATA-$TIME-backup | ${PROGMAIL} -s "backup error ${ERROR} - tar.gz - ${DATA-$TIME} !!!!" ${RECIPIENT} ;
#fi
-#TODO poczatek petli sprawdzajacej argumenty wywołania skryptu podstawiajac kolejno je pod $1
-
###################
#BACKUP bazy Mysql
###################
-if [ $1 = mysql ]; then
- mysqldump -u ${MYSQLUSER} --password=${MYSQLPASSWORD} -A | gzip -c9 > "${BCK_HOME}/${DATA}-${TIME}/mysql_base_full-${DATA}-${TIME}.gz" 2>/tmp/$DATA-$TIME-error
+if [ $2 = mysql ]; then
+ mysqldump -u ${MYSQLUSER} --password=${MYSQLPASSWORD} -A | gzip -c9 > "${BCK_HOME}/${DATA}-${TIME}/mysql_base_full-${DATA}-${TIME}.gz"
+ #> "/tmp/$DATA-$TIME-error" 2>&1
ERROR=$?
if [ ! ${ERROR} -eq 0 ]; then
echo "backup error ${ERROR} - Backup MySQL database - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
@@ -126,12 +126,12 @@
########################################
if [ $1 = rsync ]; then
- nice -n $NICELEVEL rsync -avzrp --stats --password-file="${DIRETC}/rsyncpasswd" "${BCK_HOME}/$DATA-$TIME" $USERSTORHOST@$STORHOST::$DIRSTORHOST 2>/tmp/$DATA-$TIME-error
+ nice -n $NICELEVEL rsync -avzrp --stats --password-file="${DIRETC}/rsyncpasswd" "${BCK_HOME}/$DATA-$TIME" $USERSTORHOST@$STORHOST::$DIRSTORHOST > "/tmp/$DATA-$TIME-error" 2>&1
ERROR=$?
if [ ! ${ERROR} -eq 0 ]; then
- echo "backup error ${ERROR} - send rsync to another host - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error >> /tmp/$DATA-$TIME-backup-error
- cat /tmp/$DATA-$TIME-error | ${PROGMAIL} -s "backup error ${ERROR} - send rsync to another host - $DATA-$TIME !!!!" $RECIPIENT ;
+ echo "backup error ${ERROR} - send rsync to another host - $DATA-$TIME !!!!" >> "/tmp/$DATA-$TIME-backup-error"
+ cat "tmp/$DATA-$TIME-error" >> "tmp/$DATA-$TIME-backup-error"
+ cat "tmp/$DATA-$TIME-error" | ${PROGMAIL} -s "backup error ${ERROR} - send rsync to another host - $DATA-$TIME !!!!" $RECIPIENT ;
fi
fi
########################### END rsync
@@ -141,7 +141,7 @@
#########################
if [ $1 = dvd ]; then
- mkisofs -o "/var/tmp/backup-${DATA}-${TIME}.iso" -J -r -V "Backup_${DATA}-${TIME}" "/var/kopie/${DATA}-${TIME}" 2>/tmp/$DATA-$TIME-error
+ mkisofs -o "/var/tmp/backup-${DATA}-${TIME}.iso" -J -r -V "Backup_${DATA}-${TIME}" "/var/kopie/${DATA}-${TIME}" > /tmp/$DATA-$TIME-error 2>&1
ERROR=$?;
if [ ! ${ERROR} -eq 0 ]; then
echo "backup error ${ERROR} - mkiso - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
@@ -150,7 +150,7 @@
fi
du -h /tmp/backup-$DATA-$TIME.iso >> $DIRSCRIPTS/backup-usage
#TODO - configure drive and options
- dvdrecord -dao speed=2 dev=ATAPI:0,1,0 driveropts=burnfree /var/tmp/backup-$DATA-$TIME.iso 2>/tmp/$DATA-$TIME-error
+ dvdrecord -dao speed=2 dev=ATAPI:0,1,0 driveropts=burnfree /var/tmp/backup-$DATA-$TIME.iso > /tmp/$DATA-$TIME-error 2>&1
ERROR=$?;
if [ ! ${ERROR} -eq 0 ]; then
echo "backup error ${ERROR} - dvdrecord - $DATA-$TIME !!!!" >> /tmp/$DATA-$TIME-backup-error
@@ -170,9 +170,7 @@
cat "${DIRSCRIPTS}/backup-usage" >> /tmp/$DATA-$TIME-backup-error
cat /tmp/$DATA-$TIME-backup-error | ${PROGMAIL} -s "backup ERROR !!! - $DATA-$TIME" $RECIPIENT
else
- du -h ${BCK_HOME}/*${DATA}-${TIME}* > "${VARBACKDIR}/backup-last-du"
- echo "$DATA-$TIME" > "${VARBACKDIR}/backup-last-date"
- cat "${VARBACKDIR}/backup-last-du" >> /tmp/$DATA-$TIME-backup
+ cat "${DIRSCRIPTS}/backup-usage" >> /tmp/$DATA-$TIME-backup
echo "$DATA-$TIME - ok" >> /var/log/backups
cat /tmp/$DATA-$TIME-backup | ${PROGMAIL} -s "backup OK - $DATA-$TIME" $RECIPIENT
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/projekty/server-backups/backup?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list