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

diff --git a/mirmon/exim_mirrors_ftp.lst b/mirmon/exim_mirrors_ftp.lst
index 7c192b83ff4086ac05bcc7b0f7c1773bf5b9aaa2..99e6019b02a74307bcaeb43d489461832d5514db 100644 (file)
--- a/mirmon/exim_mirrors_ftp.lst
+++ b/mirmon/exim_mirrors_ftp.lst
@@ -2,6 +2,8 @@
 # country, url, comment with address/BZ
 ##at  ftp://exim-ftp.itsoft.at/exim/                      # Down 908 days
 ##at  http://exim-ftp.itsoft.at/                          # Down 908 days
+at  ftp://mirror.easyname.at/exim-ftp                     # BZ1589 Boyan Sabev <mirror@easyname.com>
+at  rsync://mirror.easyname.at/exim                       # BZ1589 Boyan Sabev <mirror@easyname.com>
 at  ftp://exim.inode.at/
 at  ftp://ftp.univie.ac.at/applications/exim/           # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 at  http://ftp.univie.ac.at/applications/exim/          # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>

diff --git a/mirmon/exim_mirrors_www.lst b/mirmon/exim_mirrors_www.lst
index 60c4ad70b95accea5911a95bcf2a9467e9d8bbff..e37c803bdf4ec3ebc5d38111c5b6c7202df076dc 100644 (file)
--- a/mirmon/exim_mirrors_www.lst
+++ b/mirmon/exim_mirrors_www.lst
@@ -2,6 +2,7 @@
 # country, url, comment with address/BZ
 at  http://exim.inode.at/
 ##at  http://exim.itsoft.at/                           # Down 908 days
+at  http://mirror.easyname.at/exim/                    # BZ1589 Boyan Sabev <mirror@easyname.com>
 at  ftp://ftp.univie.ac.at/applications/www.exim.org/  # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 at  http://ftp.univie.ac.at/applications/www.exim.org/ # BZ1260 Wolfgang Breyha <wbreyha@gmx.net>
 au  http://exim.mirror.uber.com.au/                    # BZ1261 Seamus <mirrors@uber.com.au>

diff --git a/mirmon/mirmon_ftp.conf b/mirmon/mirmon_ftp.conf
index 3a5659949319150da294bfb481234cf7aae60e35..e77cba915c828c7111c44817cd141271782449dc 100644 (file)
--- a/mirmon/mirmon_ftp.conf
+++ b/mirmon/mirmon_ftp.conf
@@ -1,6 +1,6 @@
 # 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 /srv/mirmon/ftp_mirrors.html
 icons /mirmon-icons/
@@ -8,6 +8,6 @@ probe /home/nm4/mirror-monitor/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_freshe
 state state/exim_ftp.txt
 countries countries.list
 put_histo bottom
-project_logo http://www.exim.org/images/exim-blue-ld-sml.png
+project_logo http://exim.org/i/exim-blue-ld-125x78.png
 max_probes 50
 

diff --git a/mirmon/mirmon_www.conf b/mirmon/mirmon_www.conf
index 46ee443da1602a48e3d6f84c7e0d742fb0fe9c9f..3b93968591a8aa8366394d1bb8cbf76076877a9a 100644 (file)
--- a/mirmon/mirmon_www.conf
+++ b/mirmon/mirmon_www.conf
@@ -1,6 +1,6 @@
 # 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 /srv/mirmon/www_mirrors.html
 icons /mirmon-icons/
@@ -8,6 +8,6 @@ probe /home/nm4/mirror-monitor/mirmon/probe -q -t %TIMEOUT% %URL%/_mirror_freshe
 state state/exim_www.txt
 countries countries.list
 put_histo bottom
-project_logo http://www.exim.org/images/exim-blue-ld-sml.png
+project_logo http://exim.org/i/exim-blue-ld-125x78.png
 max_probes 50