6 files changed, 77 insertions, 26 deletions

diff --git a/etc/nginx.conf b/etc/nginx.conf
index ee815d3..f8e61bf 100644
--- a/etc/nginx.conf
+++ b/etc/nginx.conf
@@ -19,10 +19,12 @@ ssl_dhparam /home/plugins/etc/ssl/dh-parameters.pem;
 # Server definition for <https://www.monitoring-plugins.org/>.
 #
 server {
-        listen 130.133.8.40:443 ssl;
-        listen 130.133.8.40:444 ssl;
+        listen 130.133.8.40:443 ssl http2;
+        listen 130.133.8.40:444 ssl http2;
         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;
 
         #
         # Downloads and attachments.
@@ -34,7 +36,10 @@ server {
                 }
                 root /home/plugins/web;
                 fancyindex on;
+                fancyindex_default_sort date_desc;
+                fancyindex_name_length 40;
                 fancyindex_exact_size off;
+                fancyindex_time_format "%F";
                 fancyindex_css_href /resources/plugins.css;
                 fancyindex_ignore ^timestamp$;
         }
@@ -78,6 +83,15 @@ server {
         }
 
         #
+        # Rspamd.
+        #
+        location /rspamd/ {
+                proxy_pass http://127.0.0.1:11334/;
+                proxy_set_header Host $host;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        #
         # Redirects etc.
         #
         location = /favicon.ico {
@@ -119,20 +133,55 @@ server {
 }
 
 #
-# Redirect HTTP and all other domains to <https://www.monitoring-plugins.org/>.
-# Ditto for the test instance.
+# Redirect HTTP to <https://www.monitoring-plugins.org/>.  Ditto for the test
+# instance.
 #
 server {
-        listen 130.133.8.40:80 default_server;
-        listen 130.133.8.40:443 default_server ssl;
+        listen 130.133.8.40:80;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org$request_uri;
+}
+
+server {
+        listen 130.133.8.40:81;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org:444$request_uri;
+}
+
+#
+# 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:81 default_server;
-        listen 130.133.8.40:444 default_server ssl;
+        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 {
+        listen 130.133.8.40:80 default_server;
+        listen 130.133.8.40:443 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
+
+server {
+        listen 130.133.8.40:81 default_server;
+        listen 130.133.8.40:444 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
diff --git a/libexec/git-notify b/libexec/git-notify
index 64da7c0..0e50229 100755
--- a/libexec/git-notify
+++ b/libexec/git-notify
@@ -34,9 +34,12 @@
 #
 
 use strict;
-use Fcntl ':flock';
-use Encode qw(encode decode);
+use utf8;
+use feature qw(evalbytes unicode_eval unicode_strings);
+use open qw(:std :utf8);
 use Cwd 'realpath';
+use Encode qw(encode);
+use Fcntl ':flock';
 
 sub git_config($);
 sub get_repos_name();
@@ -515,7 +518,6 @@ sub send_commit_notice($$)
     }
 
     $subject .= truncate_str(${$info{"log"}}[0],50);
-    $_ = decode($info{"encoding"}, $_) for @notice;
     mail_notification("$info{'committer_name'} <$from_address>", $commitlist_address, $subject,
         "text/plain; charset=UTF-8", @notice);
 }
diff --git a/web/input/development.md b/web/input/development.md
index bb3047d..67cd3a8 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -48,7 +48,7 @@ commands:
 Also see our testing-related [development FAQs][dev-faq].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[nagios]: http://www.nagios.org/ "Nagios"
+[nagios]: https://www.nagios.org/ "Nagios"
 [github]: https://github.com/ "GitHub"
 [fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
 [pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation"
@@ -56,7 +56,7 @@ Also see our testing-related [development FAQs][dev-faq].
 [git-ref]: doc/faq/git.html#references "Git References"
 [master-img]:  https://github.com/monitoring-plugins/monitoring-plugins/actions/workflows/test.yml/badge.svg?branch=master "Build Status master"
 [coverity-img]: https://scan.coverity.com/projects/1435/badge.svg?flat=1 "Coverity Metric"
-[libtap]: http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap "LibTap Homepage"
+[libtap]: https://github.com/zorgnax/libtap "LibTap Homepage"
 [dev-faq]: doc/faq/#development "Development FAQs"
 [github-actions]: https://docs.github.com/en/actions "GitHub Docs - GitHub Actions"
 [github-ci-actions]: https://github.com/monitoring-plugins/monitoring-plugins/actions "Monitoring Plugins - Github Workflows"
diff --git a/web/input/download.md b/web/input/download.md
index 75ad689..26424b4 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -37,7 +37,7 @@ directory][snapshot] of the [download area][download].
 
 The Monitoring::Plugin module is available from [CPAN][cpan]:
 
-* <http://search.cpan.org/dist/Monitoring-Plugin/>
+* <https://metacpan.org/dist/Monitoring-Plugin>
 
 ## NagiosMIB
 
@@ -63,7 +63,7 @@ Old versions can be found [within][mib] the [download area][download].
 [download]: download/ "Download Area"
 [snapshot]: download/snapshot/ "Snapshot Directory"
 [mib]: download/mib/ "NagiosMIB Directory"
-[cpan]: http://www.cpan.org/ "CPAN"
+[cpan]: https://www.cpan.org/ "CPAN"
 [tar1]: download/monitoring-plugins-{{plugins_release}}.tar.gz "Current Release Tarball"
 [sum1]: download/monitoring-plugins-{{plugins_release}}.tar.gz.sha1 "SHA-1 Sum"
 [tar2]: download/snapshot/monitoring-plugins-master.tar.gz "Current Snapshot Tarball"
diff --git a/web/input/impressum.md b/web/input/impressum.md
index ac15f7a..0152f04 100644
--- a/web/input/impressum.md
+++ b/web/input/impressum.md
@@ -22,6 +22,6 @@ Germany
 **Jabber:**  
 &emsp; holger@jabber.fu-berlin.de
 
-[law]: http://www.gesetze-im-internet.de/ddg/__5.html
+[law]: https://www.gesetze-im-internet.de/ddg/__5.html
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/index.md b/web/input/index.md
index 6c18870..29a9285 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -33,25 +33,25 @@ monitoring products as well.
 You can get the latest releases from the [download page][download].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[icinga]: https://www.icinga.org/ "Icinga"
-[naemon]: http://naemon.github.io/ "Naemon"
-[nagios]: http://www.nagios.org/ "Nagios"
-[sensu]: http://sensuapp.org/ "Sensu"
-[shinken]: http://www.shinken-monitoring.org/ "Shinken"
+[icinga]: https://icinga.com/ "Icinga"
+[naemon]: https://www.naemon.io/ "Naemon"
+[nagios]: https://www.nagios.org/ "Nagios"
+[sensu]: https://sensu.io/ "Sensu"
+[shinken]: https://github.com/shinken-solutions/shinken "Shinken"
 [load]: doc/man/check_load.html "check_load"
 [procs]: doc/man/check_procs.html "check_procs"
 [disk]: doc/man/check_disk.html "check_disk"
 [icmp]: doc/man/check_icmp.html "check_icmp"
 [snmp]: doc/man/check_snmp.html "check_snmp"
 [http]: doc/man/check_http.html "check_http"
-[nagex]: http://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
-[icnex]: https://exchange.icinga.org/dig/Plugins "Plugins on Icinga Exchange"
-[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin Module"
+[nagex]: https://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
+[icnex]: https://exchange.icinga.com/ "Icinga Exchange"
+[module]: https://metacpan.org/dist/Monitoring-Plugin "Monitoring::Plugin Module"
 [guidelines]: doc/guidelines.html "Monitoring Plugin Development Guidelines"
 [perl-plugins]: doc/writing-perl-plugins.html "Monitoring::Plugin Presentation"
 [rename]: news/new-project-name.html "New Project Name"
-[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
-[folks]: http://www.nagios.org/about/team "Nagios Team"
+[history]: https://www.nagios.org/about/history/ "Nagios (Plugins) History"
+[folks]: https://www.nagios.org/team/ "Nagios Team"
 [download]: download.html "Download"
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->