diff --git a/sympa/resources/tools/sympa_import.bash b/sympa/resources/tools/sympa_import.bash index 8951178..37c54a0 100755 --- a/sympa/resources/tools/sympa_import.bash +++ b/sympa/resources/tools/sympa_import.bash @@ -235,19 +235,19 @@ function remove_temp { function configure_postfix { echo "$SYMPA_DOMAIN" > /etc/mailname - /opt/miaou-bash/tools/append_or_replace "^myhostname =.*$" "myhostname = $SYMPA_DOMAIN" /etc/postfix/main.cf - /opt/miaou-bash/tools/append_or_replace "^alias_maps =.*$" "alias_maps = hash:/etc/aliases, hash:/etc/mail/sympa/aliases" /etc/postfix/main.cf - /opt/miaou-bash/tools/append_or_replace "^alias_database =.*$" "alias_database = hash:/etc/aliases, hash:/etc/mail/sympa/aliases" /etc/postfix/main.cf - - /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_cert_file =.*$" "smtpd_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" - /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_key_file =.*$" "smtpd_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" - /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_security_level =.*$" "smtpd_tls_security_level = may" - /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_received_header =.*$" "smtpd_tls_received_header = yes" - /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_loglevel =.*$" "smtpd_tls_loglevel = 1" - - /opt/miaou-bash/tools/append_or_replace "^smtp_tls_cert_file =.*$" "smtp_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" - /opt/miaou-bash/tools/append_or_replace "^smtp_tls_key_file =.*$" "smtp_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" - /opt/miaou-bash/tools/append_or_replace "^smtp_tls_security_level =.*$" "smtp_tls_security_level = may" + /opt/miaou-bash/tools/append_or_replace '^myhostname =.*$' "myhostname = $SYMPA_DOMAIN" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace '^alias_maps =.*$' 'alias_maps = hash:/etc/aliases, hash:/etc/mail/sympa/aliases' /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace '^alias_database =.*$' 'alias_database = hash:/etc/aliases, hash:/etc/mail/sympa/aliases' /etc/postfix/main.cf + + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_cert_file =.*$" "smtpd_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_key_file =.*$" "smtpd_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_security_level =.*$" "smtpd_tls_security_level = may" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_received_header =.*$" "smtpd_tls_received_header = yes" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_loglevel =.*$" "smtpd_tls_loglevel = 1" /etc/postfix/main.cf + + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_cert_file =.*$" "smtp_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_key_file =.*$" "smtp_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" /etc/postfix/main.cf + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_security_level =.*$" "smtp_tls_security_level = may" /etc/postfix/main.cf } function import {