From: Nigel Metheringham <nigel@exim.org>
Date: Tue, 5 May 2015 11:37:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.exim.org/home/git/mirror-monitor
X-Git-Url: https://git.exim.org/mirror-monitor.git/commitdiff_plain/1a42d4a796b7c714e5cf4eded86cafa5faab920d

Merge branch 'master' of ssh://git.exim.org/home/git/mirror-monitor
---

1a42d4a796b7c714e5cf4eded86cafa5faab920d
diff --cc mirmon/mirmon_ftp.conf
index 3a56599,1128144..e77cba9
--- a/mirmon/mirmon_ftp.conf
+++ b/mirmon/mirmon_ftp.conf
@@@ -1,10 -1,10 +1,10 @@@
  # FTP mirrors
  project_name Exim Download Sites
- project_url http://www.exim.org/
+ project_url http://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 --cc mirmon/mirmon_www.conf
index 46ee443,8f25983..3b93968
--- a/mirmon/mirmon_www.conf
+++ b/mirmon/mirmon_www.conf
@@@ -1,10 -1,10 +1,10 @@@
  # WWW mirrors
  project_name Exim Website Mirrors
- project_url http://www.exim.org/
+ project_url http://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