Changes between Version 108 and Version 109 of SystemAdministration/Default_VM_setup

Timestamp:

09/28/18 15:06:05 (6 years ago)

Author:

André Moreira

Comment:

--

SystemAdministration/Default_VM_setup

@@ -189 +189 @@
 DOMAIN=clarin.eu
 HOSTNAME=$(hostname -f)
+HOSTNAME_REGEX_ESC=${HOSTNAME//./\\.}
 ROOT_EMAIL=sysops@${DOMAIN}
 SMTP_ADDR=vps.transip.email:587
@@ -215 +216 @@
 postconf -e "smtp_tls_security_level=encrypt"
 postconf -e "smtp_tls_note_starttls_offer=yes"
-printf '%s\n' "/^(.+)@(.+)/ ${ROOT_EMAIL}" | tee -a /etc/postfix/virtual &> /dev/null
-printf '%s\n' "/^(.+)@${HOSTNAME}$/ vps-\${1}_at_${HOSTNAME}@${DOMAIN}" | tee -a /etc/postfix/canonical &> /dev/null
+printf '%s\n' "/^(.+)@${HOSTNAME_REGEX_ESC}\$/ ${ROOT_EMAIL}" | tee -a /etc/postfix/virtual &> /dev/null
+printf '%s\n' "/^(.+)@${HOSTNAME_REGEX_ESC}\$/ ${ROOT_EMAIL}" | tee -a /etc/postfix/virtual &> /dev/null
+printf '%s\n' "/^(.+)@${HOSTNAME_REGEX_ESC}\$/ ${ROOT_EMAIL}" | tee -a /etc/postfix/virtual &> /dev/null
+printf '%s\n' "/^(.+)@${HOSTNAME_REGEX_ESC}\$/ ${ROOT_EMAIL}" | tee -a /etc/postfix/virtual &> /dev/null
+printf '%s\n' "/^(.+)@${HOSTNAME_REGEX_ESC}\$/ vps-\${1}_at_${HOSTNAME}@${DOMAIN}" | tee -a /etc/postfix/canonical &> /dev/null
 printf '%s\n' "/^From:[[:space:]]+vps\-(.+)_at_(.+)@(.+)/ REPLACE From: \"VPS host mail [\${1}@\${2}]\" <vps-\${1}_at_\${2}@\${3}>" | tee -a /etc/postfix/header_checks &> /dev/null
 printf '%s\n' "${SMTP_ADDR} ${SMTP_USER}:${SMTP_PWD}" | tee -a /etc/postfix/sasl_passwd &> /dev/null