commit - f976c0b35dec908196d35d20cca7a7b8c88ee4ca
commit + 519b84c421366d1d327a12694cb6b583cdc7d811
blob - 63f562f979c18fd826259a16448ba122283edecd
blob + 877ef8ea08934305d0964aea7d8b63cf178475fb
--- r7
+++ r7
@@ -1276,6 +1276,11 @@ import() {
 		gotd.conf
 		gotwebd.conf
 	'
+	etc_mail_files_to_import='
+		mail/aliases
+		mail/smtpd.conf
+		mail/spamd.conf
+	'
 	etc_ssh_files_to_import='
 		ssh/sshd_config
 		ssh/ssh_config
@@ -1301,6 +1306,7 @@ import() {
 		_OpenBSD_import_ssh_authorized_keys
 		_OpenBSD_import_etc_if_exists
 		_OpenBSD_import_etc_ssh_if_exists
+		_OpenBSD_import_etc_mail_if_exists
 		_OpenBSD_import_unbound_if_enabled
 		_OpenBSD_import_nsd_if_enabled
 		_OpenBSD_import_postgresql_if_installed
@@ -1347,6 +1353,15 @@ _OpenBSD_import_etc_ssh_if_exists() {
 	done
 }
 
+_OpenBSD_import_etc_mail_if_exists() {
+	mkdir -p nodes/"$target"
+	echo >&2 "--> Importing /etc/ssh"
+	for file in $etc_mail_files_to_import; do
+		ssh "$target" test -f "'/etc/$file'" &&
+			_import_copy "$target:/etc/$file" "nodes/$target/mail"
+	done
+}
+
 _OpenBSD_import_unbound_if_enabled() {
 	ssh "$target" rcctl check unbound >/dev/null && {
 		echo >&2 "--> Importing /var/unbound"