export dkimkeys

sympa/recipe/sympa.recipe

@@ -53,6 +53,15 @@ EOF
 	fi
 }
 
+function install_opendkim {
+	if $FORCE || ! systemctl is-active opendkim.service --quiet; then
+		apt-get install -y opendkim
+		echo opendkim installed successfully!
+	else
+		echo opendkim already installed!
+	fi
+}
+
 function install_nginx_host {
 	if $FORCE || [[ ! -f /etc/nginx/sites-available/sympa.conf ]]; then
 		cat <<EOF >/etc/nginx/sites-available/sympa.conf
@@ -91,5 +100,6 @@ EOF
 # MAIN
 
 install_postfix
+install_opendkim
 install_sympa
 install_nginx_host

sympa/resources/tools/sympa_export.bash

@@ -26,6 +26,7 @@ function export_files {
 	tar -C / -uf "$temp_dir/files.tar" etc/sympa/auth.conf
 	tar -C / -uf "$temp_dir/files.tar" var/lib/sympa
 	tar -C / -uf "$temp_dir/files.tar" var/spool/sympa
+	[[ -d etc/dkimkeys ]] && tar -C / -uf "$temp_dir/files.tar" etc/dkimkeys/mail.{private,txt}
 	gzip "$temp_dir/files.tar"
 }
 

sympa/resources/tools/sympa_import.bash

@@ -53,7 +53,7 @@ function replace_conf_entry_from_export {
 	sed -i "s/$pattern/$ksh93/" "$final_conf"
 }
 
-function import_files_etc {
+function import_files_etc_sympa {
 	mv etc/sympa/auth.conf /etc/sympa/
 	mv etc/sympa/data_structure.version /etc/sympa/
 
@@ -62,6 +62,16 @@ function import_files_etc {
 	replace_conf_entry_from_export lang
 }
 
+function import_files_etc_dkimkeys {
+	mkdir -p /etc/dkimkeys
+	mv etc/dkimkeys/* /etc/dkimkeys/
+	/opt/miaou-bash/tools/append_or_replace "^Domain\t.*" "Domain\t\t\t\t$(hostname -f)" /etc/opendkim.conf
+	/opt/miaou-bash/tools/append_or_replace "^KeyFile\t.*" "KeyFile\t\t\t\t/etc/dkimkeys/mail.private" /etc/opendkim.conf
+	/opt/miaou-bash/tools/append_or_replace "^Selector\t.*" "Selector\t\t\tmail" /etc/opendkim.conf
+	/opt/miaou-bash/tools/append_or_replace "^Socket\t.*" "Socket\t\t\tinet:12345@localhost" /etc/opendkim.conf
+	systemctl reload opendkim.service
+}
+
 function import_files_lib {
 	rm -rf /var/lib/sympa
 	mv var/lib/sympa /var/lib
@@ -79,7 +89,8 @@ function import_files {
 	cd "$files_temp"
 
 	tar -xf "$export_tmp/files.tar.gz"
-	import_files_etc
+	import_files_etc_sympa
+	[[ -d etc/dkimkeys ]] && import_files_etc_dkimkeys
 	import_files_lib
 	import_files_spool