2 files changed, 24 insertions, 4 deletions

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