Update for layout on Hummus

diff --git a/bin/check_update_website.sh b/bin/check_update_website.sh
index a4382c3e35f7febb1d3ff5b7cb8243ea373096a7..2b38891f59c535346bc4f0462fa43ff5299f25e0 100755 (executable)
--- a/bin/check_update_website.sh
+++ b/bin/check_update_website.sh
@@ -1,13 +1,10 @@
 #!/bin/sh
 
 
 #!/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/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
 
 git pull --quiet

diff --git a/bin/mirror-pcre b/bin/mirror-pcre
index a0a9b2b22a5684cecc2d18cfb43736d460cf2460..c1c213abff91a7969903a0ae6eec51e0f15ab705 100755 (executable)
--- a/bin/mirror-pcre
+++ b/bin/mirror-pcre
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #
 #!/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/
 
 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 4dd1b57392d91464e5722c405e9c4949822a311f..016c999c37781d2fa0cdfa81c41935c5c8cd13d7 100755 (executable)
--- a/bin/run_mirmon
+++ b/bin/run_mirmon
@@ -3,7 +3,7 @@
 #
 # Runs mirmon for both ftp and www repos
 #
 #
 # 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
 
 cd ${MIRMON_BASE} || exit
 for set in www ftp

diff --git a/mirmon/mirmon_ftp.conf b/mirmon/mirmon_ftp.conf
index 5e41e70bb1ce2a79256828146b86218729aac5a0..3a5659949319150da294bfb481234cf7aae60e35 100644 (file)
--- 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
 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/
 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
 state state/exim_ftp.txt
 countries countries.list
 put_histo bottom

diff --git a/mirmon/mirmon_www.conf b/mirmon/mirmon_www.conf
index 60ee32115c0f1775f6015dd972b4c426813a0796..46ee443da1602a48e3d6f84c7e0d742fb0fe9c9f 100644 (file)
--- 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
 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/
 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
 state state/exim_www.txt
 countries countries.list
 put_histo bottom