fix(haraka): use newer path to dkim_key_gen.sh

msimerson · Sep 3, 2024 · d5fa133 · d5fa133
1 parent f55fdf7
commit d5fa133
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/provision/haraka.sh b/provision/haraka.sh
@@ -440,7 +440,7 @@ configure_install_default()
 		local _pname="${1%.*}"
 		_source="$_haraka/node_modules/haraka-plugin-$_pname/config"
 		if [ ! -f "$_source/$1" ]; then
-			echo "unable to find default $1 in "
+			echo "unable to find default '$1' in "
 			echo "    $_haraka/config"
 			echo " or "
 			echo "    $_source"
@@ -481,7 +481,8 @@ configure_haraka_dkim()
 	fi
 
 	if [ ! -f "$HARAKA_CONF/dkim/dkim_key_gen.sh" ]; then
-		configure_install_default "dkim/dkim_key_gen.sh"
+		cp "$STAGE_MNT/usr/local/lib/node_modules/Haraka/node_modules/haraka-plugin-dkim/config/dkim_key_gen.sh" \
+			"$HARAKA_CONF/dkim/dkim_key_gen.sh"
 	fi
 
 	if [ ! -d "$HARAKA_CONF/dkim/$TOASTER_MAIL_DOMAIN" ]; then

diff --git a/test/run.sh b/test/run.sh
@@ -3,11 +3,12 @@
 echo "shellcheck *.sh"
 shellcheck ./*.sh
 
-echo "shellcheck provision/*.sh"
-shellcheck provision/*.sh
-
 echo "shellcheck include/*.sh"
 shellcheck include/*.sh
 
+echo "shellcheck provision/*.sh"
+shellcheck provision/*.sh
+
 bats test/*.bats
 bats test/include/*.bats
+bats test/provision/*.bats