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

diff --cc mirmon/mirmon_ftp.conf
index 3a5659949319150da294bfb481234cf7aae60e35,11281444fc3ea03c0b6019e73a59ea1160ffa4e0..e77cba915c828c7111c44817cd141271782449dc
--- 1/mirmon/mirmon_ftp.conf
--- 2/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 46ee443da1602a48e3d6f84c7e0d742fb0fe9c9f,8f259833b4d36e50f1236f8e461cb5a09e19e284..3b93968591a8aa8366394d1bb8cbf76076877a9a
--- 1/mirmon/mirmon_www.conf
--- 2/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