10 files changed, 37 insertions, 48 deletions
diff --git a/scripts/backup.cron b/scripts/backup.cron
index 0f12cab..408ea32 100755
--- a/scripts/backup.cron
+++ b/scripts/backup.cron
@@ -5,12 +5,14 @@ prefix="daily"
 count="25"
 list="dirs.list"
 
-echo mount -o remount,rw ${basedir}
-mount -o remount,rw ${basedir}
+mountpoint -q $basedir && umount $basedir
+
+fsck -y /dev/data/backup
+mount ${basedir}
+echo "Start @ `date`" > ${basedir}/time
 
 last=${basedir}/${prefix}.${count}
 if [ -d ${last} ]; then
-	echo rm -r ${last}
 	rm -r ${last}
 fi
 
@@ -20,28 +22,37 @@ for n in `seq ${count} -1 1`; do
 	dest=${basedir}/${prefix}.$n
 	if [ -d ${src} ]; then
 		if [ ${m} -eq 0 ]; then
-			echo cp -rl ${src} ${dest}
 			cp -rl ${src} ${dest}
 		else
-			echo mv ${src} ${dest}
 			mv ${src} ${dest}
 		fi
 	else
-		echo mkdir ${dest}
 		mkdir ${dest}
 	fi
 done
 
 for src in `cat ${basedir}/${list}`; do
-	dest=${basedir}/${prefix}.0${src}
+	dest=${basedir}/${prefix}.0/${src}
 	if [ ! -d ${dest} ]; then
-		echo mkdir -p ${dest}
 		mkdir -p ${dest}
 	fi
-	echo rsync -avx --delete ${src} ${dest}
-	rsync -avx --delete ${src} ${dest}
+	rsync -ax --delete ${src} ${dest}
 done
 
-echo mount -o remount,ro ${basedir}
-mount -o remount,ro ${basedir}
+echo "Begin MySQL @ `date`" >> ${basedir}/time
+rm -f ${basedir}/${prefix}.0/mysql.sql.xz
+mysqldump -uroot -pne65dq -xA | xz > ${basedir}/${prefix}.0/mysql.sql.xz
+
+echo "Begin LDAP @ `date`" >> ${basedir}/time
+rm -f ${basedir}/${prefix}.0/ldap.ldif.xz
+ldapsearch | xz > ${basedir}/${prefix}.0/ldap.ldif.xz
+
+echo "Begin PostgreSQL @ `date`" >> ${basedir}/time
+rm -f ${basedir}/${prefix}.0/postgresql-gentoo.sql.xz
+pg_dump -Upostgres gentoo -N _gentoo | xz > ${basedir}/${prefix}.0/postgresql-gentoo.sql.xz
+rm -f ${basedir}/${prefix}.0/postgresql-bugzilla.sql.xz
+pg_dump -Upostgres bugzilla | xz > ${basedir}/${prefix}.0/postgresql-bugzilla.sql.xz
+
+echo "End @ `date`" >> ${basedir}/time
+umount ${basedir}
 
diff --git a/scripts/backup.home.cron b/scripts/backup.home.cron
deleted file mode 100755
index b6a19c4..0000000
--- a/scripts/backup.home.cron
+++ /dev/null
@@ -1 +0,0 @@
-rsync --delete -ax profiles:/home/ /home/
diff --git a/scripts/backup.mysql.cron b/scripts/backup.mysql.cron
deleted file mode 100755
index 7f78eb1..0000000
--- a/scripts/backup.mysql.cron
+++ /dev/null
@@ -1 +0,0 @@
-rsync --delete -ax sql:/var/lib/mysql/ /var/lib/mysql/
diff --git a/scripts/backup.web.cron b/scripts/backup.web.cron
deleted file mode 100755
index e34fb3d..0000000
--- a/scripts/backup.web.cron
+++ /dev/null
@@ -1 +0,0 @@
-rsync --delete -ax www:/var/www/ /var/www/
diff --git a/scripts/checkMySQLrepl b/scripts/checkMySQLrepl
new file mode 100755
index 0000000..b9081f8
--- /dev/null
+++ b/scripts/checkMySQLrepl
@@ -0,0 +1,5 @@
+mysql -uroot -pne65dq mysql -hdefiant -e 'show master status'
+mysql -uroot -pne65dq mysql -hfirebrand -e 'show master status'
+
+mysql -uroot -pne65dq mysql -hdefiant -e 'show slave status' --vertical
+mysql -uroot -pne65dq mysql -hfirebrand -e 'show slave status' --vertical
diff --git a/scripts/checkPostgreSQLrepl b/scripts/checkPostgreSQLrepl
new file mode 100755
index 0000000..19e2615
--- /dev/null
+++ b/scripts/checkPostgreSQLrepl
@@ -0,0 +1,2 @@
+echo "select st_received as n, date_trunc('second', st_last_received_event_ts) as effective_db_time, date_trunc('second', st_last_received_ts) as last_heard_from, date_trunc('second', st_lag_time) as lagged_by from _gentoo.sl_status order by st_received;" | psql -Upostgres gentoo -hfirebrand
+echo "select st_received as n, date_trunc('second', st_last_received_event_ts) as effective_db_time, date_trunc('second', st_last_received_ts) as last_heard_from, date_trunc('second', st_lag_time) as lagged_by from _gentoo.sl_status order by st_received;" | psql -Upostgres gentoo -hdefiant
diff --git a/scripts/drbd.status b/scripts/drbd.status
new file mode 100755
index 0000000..3a5a61d
--- /dev/null
+++ b/scripts/drbd.status
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cat /proc/drbd | grep cs: | grep -v cs:Connected
diff --git a/scripts/mail-logger.sh b/scripts/mail-logger.sh
deleted file mode 100755
index 5734a28..0000000
--- a/scripts/mail-logger.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Script mailer
-
-if [ "$1" = "" -o "$2" = "" ] ; then
-	echo "Usage"
-	echo "$0 <mailto> <script> [<script_args> ...]"
-	exit 1
-fi
-
-MAILTO="$1";
-BASE="/tmp/$$"
-LOGO="${BASE}o";
-LOGE="${BASE}e";
-SCRIPT="${BASE}s";
-shift;
-
-# Execute the script
-echo "$@" > "${SCRIPT}";
-chmod +x "${SCRIPT}"
-"${SCRIPT}" > "${LOGO}" 2> "${LOGE}";
-
-if [ -s "${LOGE}" ] ; then
-	mailx -s "Errors from ${1}" "${MAILTO}" < "${LOGE}";
-fi
-if [ -s "${LOGO}" ] ; then
-	mailx -s "Output from ${1}" "${MAILTO}" < "${LOGO}";
-fi
-rm "${LOGO}" "${LOGE}" "${SCRIPT}"
-
-
diff --git a/scripts/sa-learn b/scripts/sa-learn
new file mode 100755
index 0000000..72200b5
--- /dev/null
+++ b/scripts/sa-learn
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sa-learn --spam /home/*/.maildir/.Junk/{cur,new}/* > /dev/null
+
diff --git a/scripts/update-world b/scripts/update-world
deleted file mode 100644
index ea57c70..0000000
--- a/scripts/update-world
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-mail-logger.sh dan@randomdan.homeip.net emerge -uDN world
-