Просмотр исходного кода

Fix bash-only syntax in adddomain.sh, fix domain not being added to login_maps.pcre in adddomain.sh

pull/360/head
thePurpyel 5 дней назад
Родитель
Сommit
efb0aa7de3
1 измененных файлов: 7 добавлений и 4 удалений
  1. +7
    -4
      adddomain.sh

+ 7
- 4
adddomain.sh Просмотреть файл

@@ -3,10 +3,12 @@
domain="$1" domain="$1"


# Input validation to allow only valid domain characters # Input validation to allow only valid domain characters
if ! [[ "$domain" =~ ^[a-zA-Z0-9.-]+$ ]]; then
echo "Give a valid domain as an argument to add mail server for it. Only alphanumeric characters, dashes, and dots are allowed."
exit 1
fi
case "$domain" in
""|*[!a-zA-Z0-9.-]*)
echo "Give a valid domain as an argument to add mail server for it. Only alphanumeric characters, dashes, and dots are allowed."
exit 1
;;
esac


subdom="mail" subdom="mail"
maildomain="mail.$(cat /etc/mailname)" maildomain="mail.$(cat /etc/mailname)"
@@ -24,6 +26,7 @@ chmod -R g+r /etc/postfix/dkim/*
# Add entries to keytable and signing table # Add entries to keytable and signing table
echo "$subdom._domainkey.$domain $domain:$subdom:/etc/postfix/dkim/$domain/$subdom.private" >> /etc/postfix/dkim/keytable echo "$subdom._domainkey.$domain $domain:$subdom:/etc/postfix/dkim/$domain/$subdom.private" >> /etc/postfix/dkim/keytable
echo "*@$domain $subdom._domainkey.$domain" >> /etc/postfix/dkim/signingtable echo "*@$domain $subdom._domainkey.$domain" >> /etc/postfix/dkim/signingtable
echo "/^(.*)@$(echo "$domain" | sed 's/\./\\./')\$/ \${1}" >> /etc/postfix/login_maps.pcre


systemctl reload opendkim postfix systemctl reload opendkim postfix




Загрузка…
Отмена
Сохранить