Merge branch 'master' into outbound-hook-delivered

haraka · Oct 2, 2024 · c8acb8f · c8acb8f
2 parents cda0a43 + d8b8f7a
commit c8acb8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -4,9 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
-
 - fix(outbound): in outbound hook_delivered, when mx.exchange contains
   an IP, use mx.from_dns
+- fix(bin/haraka): fix for finding path to config/docs/Plugins.md
 
 ### [3.0.5] - 2024-09-27
 

diff --git a/bin/haraka b/bin/haraka
@@ -228,7 +228,8 @@ const plugin_doc = [
 
 
 function getHooks () {   // see haraka/Haraka#3306
-    return fs.readFileSync('docs/Plugins.md').toString()
+    const pi_path = path.resolve(parsed.configs, 'docs', 'Plugins.md')
+    return fs.readFileSync(pi_path).toString()
         .split('## Available Hooks')[1]    // discard everything before this string
         .split('### rcpt')[0]              // discard everything after this string
         .match(/\*\s(\S+)/gm)              // grab the first word of lines starting with '* '