diff --git a/SubModules/postfix/CMSHook-conf.sh b/SubModules/postfix/CMSHook-conf.sh index 9216964..d66962d 100644 --- a/SubModules/postfix/CMSHook-conf.sh +++ b/SubModules/postfix/CMSHook-conf.sh @@ -11,7 +11,7 @@ fi curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-$sitename.sh -sed -i -e 's/DOMAINname/'$domain'/g' -e 's/SITEName/'${sitename//_}'/g' ~/OpenDKIMInit-$sitename.sh +sed -i -e 's/DOMAINname/'$maildomain'/g' -e 's/SITEName/'${sitename//_}'/g' ~/OpenDKIMInit-$sitename.sh cat << EOF > /etc/update-motd.d/51-opendkim-"${sitename//_}" #!/bin/sh diff --git a/SubModules/postfix/CMSHook-preconf.sh b/SubModules/postfix/CMSHook-preconf.sh index 7d0bb76..41bf3ed 100644 --- a/SubModules/postfix/CMSHook-preconf.sh +++ b/SubModules/postfix/CMSHook-preconf.sh @@ -19,8 +19,8 @@ if [ $IMODE = l ]; then break;; [Nn]* ) echo 'Enter mail addres for sending mail? ' - read mail - maildomain=$(sed -e 's/[^@]*@//' <<< "$mail") + read mailas + maildomain=$(sed -e 's/[^@]*@//' <<< "$mailas") break;; * )echo "Choose yes or no.";; esac diff --git a/SubModules/postfix/conf.sh b/SubModules/postfix/conf.sh index eb1fc77..7cb0f25 100644 --- a/SubModules/postfix/conf.sh +++ b/SubModules/postfix/conf.sh @@ -40,7 +40,8 @@ adduser postfix opendkim rm -rf /etc/opendkim.d mkdir -p /etc/opendkim.d/keys chown opendkim:opendkim /etc/opendkim.d/keys -R -curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim +curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf +touch /etc/opendkim.d/SigningTable cat < /etc/opendkim.d/TrustedHosts 127.0.0.1 ::1