diff --git a/sympa/recipe/sympa_fix_dkim_global_on.recipe b/sympa/recipe/sympa_fix_dkim_global_on.recipe index 55903c5..233337d 100644 --- a/sympa/recipe/sympa_fix_dkim_global_on.recipe +++ b/sympa/recipe/sympa_fix_dkim_global_on.recipe @@ -9,11 +9,11 @@ GLOBAL_CONF=/etc/sympa/sympa/sympa.conf function fix_dkim_global_on { if ! grep -q "^dkim_feature[[:space:]]*on" $GLOBAL_CONF; then local sympa_domain=$(grep '^domain' "$GLOBAL_CONF" | cut -f2) - /opt/miaou-bash/tools/append_or_replace "^dkim_feature.*$" 'dkim_feature on' $GLOBAL_CONF - /opt/miaou-bash/tools/append_or_replace "^dkim_signature_apply_on.*$" 'dkim_signature_apply_on any' $GLOBAL_CONF - /opt/miaou-bash/tools/append_or_replace "^dkim_parameters.private_key_path.*$" 'dkim_parameters.private_key_path /etc/dkimkeys/mail.private' $GLOBAL_CONF - /opt/miaou-bash/tools/append_or_replace "^dkim_parameters.selector.*$" 'dkim_parameters.selector mail' $GLOBAL_CONF - /opt/miaou-bash/tools/append_or_replace "^dkim_parameters.signer_domain.*$" "dkim_parameters.signer_domain $sympa_domain" $GLOBAL_CONF + /opt/miaou-bash/tools/append_or_replace '^dkim_feature.*$' 'dkim_feature on' $GLOBAL_CONF + /opt/miaou-bash/tools/append_or_replace '^dkim_signature_apply_on.*$' 'dkim_signature_apply_on any' $GLOBAL_CONF + /opt/miaou-bash/tools/append_or_replace '^dkim_parameters.private_key_path.*$' 'dkim_parameters.private_key_path /etc/dkimkeys/mail.private' $GLOBAL_CONF + /opt/miaou-bash/tools/append_or_replace '^dkim_parameters.selector.*$' 'dkim_parameters.selector mail' $GLOBAL_CONF + /opt/miaou-bash/tools/append_or_replace '^dkim_parameters.signer_domain.*$' "dkim_parameters.signer_domain $sympa_domain" $GLOBAL_CONF systemctl restart wwsympa.socket echo 'dkim feature now enabled' else diff --git a/sympa/resources/tools/sympa_import.bash b/sympa/resources/tools/sympa_import.bash index 5f4c2cc..8951178 100755 --- a/sympa/resources/tools/sympa_import.bash +++ b/sympa/resources/tools/sympa_import.bash @@ -64,7 +64,7 @@ function import_files_etc_sympa { replace_conf_entry_from_export listmaster replace_conf_entry_from_export lang - /opt/miaou-bash/tools/append_or_replace "^aliases_program.*$" "aliases_program postalias" /etc/sympa/sympa/sympa.conf + /opt/miaou-bash/tools/append_or_replace '^aliases_program.*$' 'aliases_program postalias' /etc/sympa/sympa/sympa.conf } function import_files_etc_mail_sympa_aliases {