From: Nigel Metheringham <nigel@exim.org>
Date: Thu, 19 Feb 2015 20:58:30 +0000 (+0000)
Subject: Update for layout on Hummus
X-Git-Url: https://git.exim.org/mirror-monitor.git/commitdiff_plain/b7dc7a30ab722d3e28701fc7553567c873c23373

Update for layout on Hummus
---

diff --git a/bin/check_update_website.sh b/bin/check_update_website.sh
index a4382c3..2b38891 100755
--- a/bin/check_update_website.sh
+++ b/bin/check_update_website.sh
@@ -1,13 +1,10 @@
 #!/bin/sh
 
 
-# ensure we use a current perl
-export PATH=/home/nm4/perl5/perlbrew/bin:$PATH
-
 cd /home/nm4/src/exim-website || exit
 
 git pull | grep -q -v 'Already up-to-date.' && script/build.sh
 
-cd /home/services/mirmon || exit
+cd /home/nm4/mirror-monitor || exit
 
 git pull --quiet
diff --git a/bin/mirror-pcre b/bin/mirror-pcre
index a0a9b2b..c1c213a 100755
--- a/bin/mirror-pcre
+++ b/bin/mirror-pcre
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #
-cd /home/services/ftp/pub || exit 2
+cd /srv/ftp/pub || exit 2
 
 VERBOSE='--quiet'
 wget ${VERBOSE} --mirror --no-host-directories --cut-dirs=3 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
diff --git a/bin/run_mirmon b/bin/run_mirmon
index 4dd1b57..016c999 100755
--- a/bin/run_mirmon
+++ b/bin/run_mirmon
@@ -3,7 +3,7 @@
 #
 # Runs mirmon for both ftp and www repos
 #
-MIRMON_BASE=/home/services/mirmon/mirmon
+MIRMON_BASE=/home/nm4/mirror-monitor/mirmon
 
 cd ${MIRMON_BASE} || exit
 for set in www ftp
diff --git a/mirmon/mirmon_ftp.conf b/mirmon/mirmon_ftp.conf
index 5e41e70..3a56599 100644
--- a/mirmon/mirmon_ftp.conf
+++ b/mirmon/mirmon_ftp.conf
@@ -2,9 +2,9 @@
 project_name Exim Download Sites
 project_url http://www.exim.org/
 mirror_list exim_mirrors_ftp.lst
-web_page /home/services/web/mirmon/ftp_mirrors.html
+web_page /srv/mirmon/ftp_mirrors.html
 icons /mirmon-icons/
-probe /home/services/mirmon/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_fresheness_marker.txt
+probe /home/nm4/mirror-monitor/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_fresheness_marker.txt
 state state/exim_ftp.txt
 countries countries.list
 put_histo bottom
diff --git a/mirmon/mirmon_www.conf b/mirmon/mirmon_www.conf
index 60ee321..46ee443 100644
--- a/mirmon/mirmon_www.conf
+++ b/mirmon/mirmon_www.conf
@@ -2,9 +2,9 @@
 project_name Exim Website Mirrors
 project_url http://www.exim.org/
 mirror_list exim_mirrors_www.lst
-web_page /home/services/web/mirmon/www_mirrors.html
+web_page /srv/mirmon/www_mirrors.html
 icons /mirmon-icons/
-probe /home/services/mirmon/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_fresheness_marker.txt
+probe /home/nm4/mirror-monitor/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_fresheness_marker.txt
 state state/exim_www.txt
 countries countries.list
 put_histo bottom