local_is_backup

git-svn-id: svn://presbrey.mit.edu/sql@184 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/libexec/cron-daily-local.sh b/libexec/cron-daily-local.sh
index 7746deb6cdbe1eebbbe8a0f423b01227a3208977..a9ee3d8b540a5e54db0064f6c0df9c31fedfd685 100755 (executable)
--- a/libexec/cron-daily-local.sh
+++ b/libexec/cron-daily-local.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-if [[ -s /srv/mysql/master.info ]]; then
+/srv/libexec/local_is_backup
+BACKUP="$?"
+if [[ "$BACKUP" == "0" ]]; then
     NEWBF=/srv/backup/daily/sql.mit.edu_`date +%Y-%m-%d`.sql.gz
     /usr/bin/mysqldump -umit-backup -efqQK --all-databases | gzip > $NEWBF
     if [[ -s $NEWBF && `ls /srv/backup/daily/ | wc -l` -ge 4 ]]; then

diff --git a/libexec/cron-weekly-local.sh b/libexec/cron-weekly-local.sh
index 47ff5fd892ac3f22ae80acea0f0ed59688b79502..3f864941fbbf1937debd8678ba545c95309194a5 100755 (executable)
--- a/libexec/cron-weekly-local.sh
+++ b/libexec/cron-weekly-local.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
-if [[ -s /srv/mysql/master.info ]]; then
+/srv/libexec/local_is_backup
+BACKUP="$?"
+if [[ "$BACKUP" == "0" ]]; then
     if [[ `ls /srv/backup/daily/ | wc -l` -ge 3 ]]; then
         mv /srv/backup/daily/`ls -t /srv/backup/daily/ | tail -n1` /srv/backup/weekly/
     fi
 fi
+
+/srv/libexec/backup-policy.py /srv/backup | sh

diff --git a/libexec/local_is_backup b/libexec/local_is_backup
new file mode 100755 (executable)
index 0000000..275fb50
--- /dev/null
+++ b/libexec/local_is_backup
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+
+import socket, sys
+from urllib import urlopen
+is_backup = False
+try:
+    master = urlopen('http://stuff.mit.edu/afs/athena/contrib/sql/etc/master').read().strip()
+    if master != socket.gethostname():
+        is_backup = True
+except Exception, e:
+    pass
+
+if is_backup:
+    sys.exit(0)
+else:
+    sys.exit(1)