Merge branch 'master' of /home/git/mirror-monitor

diff --git a/bin/daily_git_commit_mail.sh b/bin/daily_git_commit_mail.sh
index 10c617cf58f535a17f9c72663515fb597955cceb..e721f84f400596934e89cb167d435f84173e1e49 100755 (executable)
--- a/bin/daily_git_commit_mail.sh
+++ b/bin/daily_git_commit_mail.sh
@@ -23,7 +23,7 @@ export SENDMAIL=/usr/sbin/exim
 #
 export MAILTAG=/home/nm4/.git-mail-exim
 export MLIST=exim-cvs@exim.org
-export GITWEB=http://git.exim.org/exim.git
+export GITWEB=https://git.exim.org/exim.git
 flock  $0 /home/services/misc-git-hacks/git-feed-mail-list.sh
 
 #
@@ -32,7 +32,7 @@ flock  $0 /home/services/misc-git-hacks/git-feed-mail-list.sh
 export GIT_DIR=/home/git/exim-website.git
 export MAILTAG=/home/nm4/.git-mail-exim-website
 export MLIST=exim-cvs@exim.org
-export GITWEB=http://git.exim.org/exim-website.git
+export GITWEB=https://git.exim.org/exim-website.git
 flock  $0 /home/services/misc-git-hacks/git-feed-mail-list.sh
 
 # end

diff --git a/mirmon/exim_mirrors_ftp.lst b/mirmon/exim_mirrors_ftp.lst
index 3455181435c5e556af013c69e43ea9b6287021ef..834e8bf95c7a799547dec5727c8c53ff390a5905 100644 (file)
--- a/mirmon/exim_mirrors_ftp.lst
+++ b/mirmon/exim_mirrors_ftp.lst
@@ -45,6 +45,7 @@ pt  ftp://mirrors.dominios.pt/pub/ftp.exim.org/         # Carlos Santos <cjsanto
 ##ru  rsync://mirrors-ru.go-parts.com/mirrors/eximftp/    # BZ1508 Dan Derebenskiy <dderebenskiy@go-parts.com>
 ua  http://exim.telcom.net.ua/ftp/                      # Oleksandr(Alex) Panchuk <lxadm@telcom.net.ua> BZ983
 uk  ftp://ftp.exim.org/pub/
+uk  https://ftp.exim.org/pub/exim/
 uk  ftp://ftp.mirrorservice.org/sites/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>
 uk  http://www.mirrorservice.org/sites/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>
 uk  rsync://rsync.mirrorservice.org/ftp.exim.org/pub/ # BZ1320 Tim Bishop <tim@bishnet.net>

diff --git a/mirmon/mirmon_ftp.conf b/mirmon/mirmon_ftp.conf
index e77cba915c828c7111c44817cd141271782449dc..b1d1d986842da57f5e280022e71013ff5083acc7 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://exim.org/
+project_url https://www.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://exim.org/i/exim-blue-ld-125x78.png
+project_logo https://www.exim.org/i/exim-blue-ld-125x78.png
 max_probes 50
 

diff --git a/mirmon/mirmon_www.conf b/mirmon/mirmon_www.conf
index 3b93968591a8aa8366394d1bb8cbf76076877a9a..577d08eda700d23230d300e665b695c5d15dab8b 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://exim.org/
+project_url https://www.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://exim.org/i/exim-blue-ld-125x78.png
+project_logo https://www.exim.org/i/exim-blue-ld-125x78.png
 max_probes 50