- [privatedial](src/privatedial) Allow all TLS protocols in the minivm-send bash script.

- [test](test/Makefile) Now also test the PHP is setup correctly.

Author: mlan

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.1.4
+
+- [privatedial](src/privatedial) Allow all TLS protocols in the `minivm-send` bash script.
+- [test](test/Makefile) Now also test the PHP is setup correctly.
+
 # 1.1.3
 
 - [repo](src) Fix the bug; websms and autoban not working. We need to use softlinks to ../../share/php81/.

src/privatedial/bin/minivm-send

@@ -43,9 +43,9 @@ done
 #
 case "$sendmail_proto" in
 starttls)
-	sendmail_args+=("-H" "openssl s_client -quiet -tls1 -starttls smtp -connect $sendmail_host") ;;
+	sendmail_args+=("-H" "openssl s_client -quiet -starttls smtp -connect $sendmail_host") ;;
 smtps|tls)
-	sendmail_args+=("-H" "openssl s_client -quiet -tls1 -connect $sendmail_host") ;;
+	sendmail_args+=("-H" "openssl s_client -quiet -connect $sendmail_host") ;;
 smtp|*)
 	sendmail_args+=("-S" "$sendmail_host") ;;
 esac
@@ -55,15 +55,18 @@ esac
 # Asterisk pass the message via stdin to this script and
 # that stream is inherited here
 #
-sendmail "${sendmail_args[@]}" &>/dev/null
-sendmail_extival=$?
+sendmail_output=$(sendmail "${sendmail_args[@]}" 2>&1)
+sendmail_exitval=$?
+sendmail_cmd="sendmail ${sendmail_args[@]}"
 
 #
 # Log sendmail status and exit
 #
-if [ $sendmail_extival -eq 0 ]; then
+if [ $sendmail_exitval -eq 0 ]; then
 	logger "${logger_args[@]}" -p mail.info "INFO: Successfully sent mail ($sendmail_host)"
 else
 	logger "${logger_args[@]}" -p mail.err "ERROR: Unable to send mail ($sendmail_host)"
+	logger "${logger_args[@]}" -p mail.err "$sendmail_cmd"
+	logger "${logger_args[@]}" -p mail.err "$sendmail_output"
 fi
-exit $sendmail_extival
+exit $sendmail_exitval

test/Makefile

@@ -58,7 +58,7 @@ ps:
 test-all: $(addprefix test_,1 2 3 4)
 
 
-test_%: test-up_% test-wait_% test-logs_% test-ping_% test-down_%
+test_%: test-up_% test-wait_% test-logs_% test-autoban_% test-ping_% test-down_%
 
 
 test-up_1: test-up-net
@@ -108,6 +108,9 @@ test-ping_%: test-version_%
 test-version_%:
 	docker exec -it $(PBX_NAME) asterisk -x "pjsip show version" | grep PJPROJECT
 
+test-autoban_%:
+	case $* in [2-3]) docker exec -it $(PBX_NAME) autoban;; esac
+
 test-logs_%:
 	docker container logs $(PBX_NAME) | grep 'docker-entrypoint.sh' || true