7 files changed, 108 insertions, 48 deletions

diff --git a/bin/check-mirrors b/bin/check-mirrors
index 9048640..badcb83 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -17,9 +17,7 @@ mirrors='
     https://ftp.lysator.liu.se/pub/monitoring-plugins/
     https://ftp.belnet.be/mirror/nagios-plugins.org/
     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/
@@ -105,25 +103,6 @@ mirrors='
 #   Home page:
 #   - http://www.en.uoc.gr/
 #
-# PORTUGAL
-#
-#   URLs:
-#   - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
-#   - http://mirrors.fe.up.pt/pub/monitoring-plugins/
-#   - https://mirrors.fe.up.pt/pub/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated daily
-#
-#   Contacts:
-#   - Mirror Admins <mirrors AT fe.up.pt>
-#   - Filipe Carvalho <filipec AT sp.up.pt>
-#
-#   Home page:
-#   - http://www.sp.up.pt/
-#
 # UNITED STATES
 #
 #   URLs:
@@ -142,23 +121,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..4758175 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -19,8 +19,7 @@ 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].
+[Russia][mirror-ru], [Sweden][mirror-se], and the [USA][mirror-us].
 
 ### Development Snapshot
 
@@ -53,7 +52,6 @@ Old versions can be found [within][mib] the [download area][download].
 [mirror-de]: https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "Mirror in Germany"
 [mirror-gr]: https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "Mirror in Greece"
 [mirror-kr]: https://ftp.kaist.ac.kr/nagios-plugins/ "Mirror in Korea"
-[mirror-pt]: https://mirrors.fe.up.pt/pub/monitoring-plugins/ "Mirror in Portugal"
 [mirror-ru]: http://mirror.mephi.ru/nagios-plugins/ "Mirror in Russia"
 [mirror-se]: https://ftp.lysator.liu.se/pub/monitoring-plugins/ "Mirror in Sweden"
 [mirror-uk]: https://mirror.bytemark.co.uk/monitoring-plugins/ "Mirror in the United Kingdom"
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
diff --git a/web/input/news/release-3-0-0.md b/web/input/news/release-3-0-0.md
new file mode 100644
index 0000000..85c7982
--- /dev/null
+++ b/web/input/news/release-3-0-0.md
@@ -0,0 +1,80 @@
+title: Version 3.0.0-rc1 Released
+author: Lorenz Kästle
+date: 2025-12-03
+---
+
+The Monitoring Plugins Development Team announces version 3.0.0-rc1 of
+the Monitoring Plugins! 
+This release is different in several regards to previous releases.
+Due the a significant refactoring and the unintented side effect this
+may have, the "real" release will be following release candidates which
+are intented to for early adapters and testing.
+<end-of-teaser>
+
+The core parts of this release are significant changes to the C part of this
+project, which should be mostly internal and not change the results in a
+significant way (meaning the input parameters mostly stay as they are and the
+exit code should remain the same if the parameters are the same in the old
+version and context did not change).
+The reality is, that big changes have
+unintented consequences which are not covered in the test cases or some
+consequences were not in our scope at all.
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### General changes
+* In the C part of the project
+  * Heavy refactoring to simplify and unify the code base
+  * Introduction of a generalized output mechanism for most plugins
+  * Standardized code formatting via `clang-format`
+
+### Specific changes 
+#### check_curl
+`check_curl` received a lot of changes which improve the documentation and
+fix several bugs.
+It is also not considered experimental anymore.
+
+Additionaly `check_curl` can now be configured to handle cookies internally
+without saving cookies to the filesystem.
+
+#### check_http
+`check_http` is now considered deprecated and will not receive attention any
+more. It is replaced by `check_curl`
+
+#### check_snmp
+`check_snmp` does not execute `snmpget` or `snmpgetnext` anymore but executes
+the net-snmp calls natively now.
+
+#### check_nwstat
+`check_nwstat` was removed, due to its perceived insignificance in the current
+IT world. This reduces the maintenance load and ressource consumption in
+general.
+
+#### check_by_ssh
+`check_by_ssh` ignores output on `stderr` by default now. This should
+avoid false positives for warnings by the OpenSSH client (especially
+about the server missing Post-Quantum cryptography.
+
+#### check_dns
+`check_dns` now ignores CNAMES in reverse DNS mode.
+
+#### check_fping
+If during compilation `fping` 5.2, 5.3 or higher are present, `check_fping` 
+will be able to use new options which were introduced with these versions.
+These options are (equivalent to the ones with the same name in `fping`)
+`--fwmark`, `--icmp-timestamp` and `--check-source`.
+The older flags `--dontfrag` and `--random` were also added.
+
+Also the `-4` and `-6` flags may not have worked as intented and should be
+fixed now.
+
+#### check_mysql
+`check_mysql` should now be able to correctly detect whether a replica is
+attached and working correctly.
+Changes were necessary here to adapt to changes in the naming convention in
+MySQL.
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/macros.py b/web/macros.py
index 5536f3f..3eb1046 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -3,7 +3,7 @@ import math
 import os.path
 import time
 
-plugins_release = '2.4.0'
+plugins_release = '3.0.0-rc1'
 mib_release = '1.0.1'
 release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.monitoring-plugins.org/'