5 files changed, 28 insertions, 26 deletions

diff --git a/bin/check-mirrors b/bin/check-mirrors
index 9048640..168104f 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -19,7 +19,6 @@ mirrors='
     https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
     https://mirrors.fe.up.pt/pub/monitoring-plugins/
     https://ftp2.osuosl.org/pub/monitoring-plugins/
-    https://mirror.bytemark.co.uk/monitoring-plugins/
     http://mirror.mephi.ru/nagios-plugins/
     https://ftp.kaist.ac.kr/nagios-plugins/
     https://mirrors.ustc.edu.cn/monitoring-plugins/
@@ -142,23 +141,6 @@ mirrors='
 #   - http://osuosl.org/
 #
 #
-# UNITED KINGDOM
-#
-#   URLs:
-#   - http://mirror.bytemark.co.uk/monitoring-plugins/
-#   - https://mirror.bytemark.co.uk/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated twice a day
-#
-#   Contacts:
-#   - James Lawrie <support AT support.bytemark.co.uk>
-#
-#   Home page:
-#   - http://www.bytemark.co.uk/
-#
 # RUSSIA
 #
 #   URLs:
diff --git a/etc/nginx.conf b/etc/nginx.conf
index 1a6687f..f8e61bf 100644
--- a/etc/nginx.conf
+++ b/etc/nginx.conf
@@ -21,7 +21,7 @@ ssl_dhparam /home/plugins/etc/ssl/dh-parameters.pem;
 server {
         listen 130.133.8.40:443 ssl http2;
         listen 130.133.8.40:444 ssl http2;
-        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        server_name www.monitoring-plugins.org;
         root /home/plugins/web/port-$server_port;
         ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
         ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
@@ -149,6 +149,25 @@ server {
 }
 
 #
+# Add "www" prefix.  Ditto for the test instance.
+#
+server {
+        listen 130.133.8.40:443 ssl http2;
+        server_name monitoring-plugins.org;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+        return 301 https://www.monitoring-plugins.org$request_uri;
+}
+
+server {
+        listen 130.133.8.40:444 ssl http2;
+        server_name monitoring-plugins.org;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+        return 301 https://www.monitoring-plugins.org:444$request_uri;
+}
+
+#
 # Outdated domains. Can be deleted in 2026.
 #
 server {
diff --git a/libexec/git-notify b/libexec/git-notify
index 0e50229..228c7d6 100755
--- a/libexec/git-notify
+++ b/libexec/git-notify
@@ -4,6 +4,7 @@
 #
 # Copyright 2005 Alexandre Julliard
 # Copyright 2009, 2013 Nagios Plugins Development Team
+# Copyright 2024, 2025 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -452,7 +453,7 @@ sub send_commit_notice($$)
     my ($ref,$obj) = @_;
     my %info = get_object_info($obj);
     my @notice = ();
-    my ($url,$subject,$obj_string);
+    my ($url,$from,$subject,$obj_string);
 
     if ($gitweb_url)
     {
@@ -518,8 +519,8 @@ sub send_commit_notice($$)
     }
 
     $subject .= truncate_str(${$info{"log"}}[0],50);
-    mail_notification("$info{'committer_name'} <$from_address>", $commitlist_address, $subject,
-        "text/plain; charset=UTF-8", @notice);
+    $from = encode("MIME-Q",$info{'committer_name'}) . " <$from_address>";
+    mail_notification($from, $commitlist_address, $subject, "text/plain; charset=UTF-8", @notice);
 }
 
 # send a commit notice to the CIA server
diff --git a/web/input/download.md b/web/input/download.md
index 26424b4..b60b49f 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -19,8 +19,8 @@ See the [release history][news] for an overview of changes between earlier
 versions.  Old releases can be found in the [download area][download].  There
 are mirrors available in [Belgium][mirror-be], [China][mirror-cn],
 [Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr],
-[Portugal][mirror-pt], [Russia][mirror-ru], [Sweden][mirror-se], the
-[UK][mirror-uk], and the [USA][mirror-us].
+[Portugal][mirror-pt], [Russia][mirror-ru], [Sweden][mirror-se], and the
+[USA][mirror-us].
 
 ### Development Snapshot
 
diff --git a/web/input/impressum.md b/web/input/impressum.md
index 0152f04..d79ea74 100644
--- a/web/input/impressum.md
+++ b/web/input/impressum.md
@@ -9,12 +9,12 @@ parent: Home
 Responsible for the content of this site:
 
 Holger Weiß  
-Gutsmuthsstr. 19  
+Buggestr. 11  
 12163 Berlin  
 Germany
 
 **Phone:**  
-&emsp; +49 30 61286685
+&emsp; +49 160 7282852
 
 **Email:**  
 &emsp; holger@zedat.fu-berlin.de