Commit previously un-commited changes to the automirror code

git-svn-id: https://pgweb.postgresql.org/svn/trunk@2326 8f5c7a92-453e-0410-a47f-ad33c8a6b003

diff --git a/autodnscheck.pl b/autodnscheck.pl
index bd95473ad1410713b8c8162cc2ab40a71d93392c..cbecfe4be8392be14ffe536b699520e7bdc34ea7 100644 (file)
--- a/autodnscheck.pl
+++ b/autodnscheck.pl
@@ -6,7 +6,7 @@ use Net::DNS;
 
 my $DEBUG=0;
 my $DOMAIN="mirrors.postgresql.org";
-my $MASTER="62.65.68.81";
+my $MASTER="nagios.pgadmin.org";
 
 my $errors = '';
 

diff --git a/automirror.php b/automirror.php
index dfc72a353e20af9615c33a74068c4a67e774317d..d9563c16647ffb89028642e154c81489bda596a4 100644 (file)
--- a/automirror.php
+++ b/automirror.php
@@ -2,7 +2,7 @@
        // Maximum age of a mirror in seconds
        $MAX_TIME_DIFF = 60*125; // 120 minutes + a little margin
        // Path for zone file
-       $ZONE_PATH = "/usr/local/bind/var/";
+       $ZONE_PATH = "/usr/local/automirror/zone/";
        // IP of the master machine that keeps the main timestamp
        $MASTERIP = '217.196.146.204';
 

diff --git a/automirror.sh b/automirror.sh
index 77893665c706ef6bbacf469608cc7858d2e6833c..e9097d6ec5636b5b4248543555b195ff33fabd74 100644 (file)
--- a/automirror.sh
+++ b/automirror.sh
@@ -2,11 +2,11 @@
 
 # Run the automirror script with a timeout (in seconds)
 TIMEOUT=120
-MAILREPORT="[email protected] [email protected] [email protected]"
+MAILREPORT="Sysadmin Reports <[email protected]>"
 
-cd /root/pgmirror
+cd /usr/local/automirror/automirror
 
-/usr/local/bin/php automirror.php "$MAILREPORT" > mirrors.log 2>&1 &
+/usr/bin/php automirror.php "$MAILREPORT" > mirrors.log 2>&1 &
 export BG=$!
 (sleep $TIMEOUT >/dev/null 2>&1 ; kill ${BG} > /dev/null 2>&1) &
 export BG2=$!
@@ -17,5 +17,5 @@ if [ ! $? = 0 ]; then
 fi
 
 kill ${BG2} >/dev/null 2>&1
-/usr/local/bind/sbin/rndc reload mirrors.postgresql.org
+/usr/sbin/rndc reload mirrors.postgresql.org