diff --git a/installer.sh b/installer.sh index 37d5519..f80ffdd 100644 --- a/installer.sh +++ b/installer.sh @@ -401,8 +401,11 @@ ln -s /opt/rainloop /var/www/"$domain"/html/ ##--------------## msg " Configuring OpenDKIM" sleep 2 -wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/beta/config/dkim/opendkim.sh -O /tmp/opendkim.sh +wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/dkim/opendkim.sh -O /tmp/opendkim.sh source /tmp/opendkim.sh > $OUTPUT 2>&1 +echo "### OpenDKIM key:" >> ~/Readme.md +cat /etc/opendkim/keys/$domonly/default.txt >> ~/Readme.md +echo "" >> ~/Readme.md ##-------------------------## # Max attachment size # @@ -441,6 +444,18 @@ msg " Configuring Mail-queue" sleep 2 wget -q -t7 https://git.ictmaatwerk.com/VPS-scripts/Ubuntu-Mail/raw/branch/"$branch"/config/postfix/clear-queue.sh -O /tmp/clear-queue.sh source /tmp/clear-queue.sh +echo "### Postfix mail queue:" >> ~/Readme.md +echo "#Show queue" >> ~/Readme.md +echo "postqueue -p" >> ~/Readme.md +echo "#Show message" >> ~/Readme.md +echo "postcat -vq XXXXXXXXXX" >> ~/Readme.md +echo "#Flushing the queue" >> ~/Readme.md +echo "postqueue -f" >> ~/Readme.md +echo "#Removing all queued messages" >> ~/Readme.md +echo "postsuper -d ALL" >> ~/Readme.md +echo "#Remove differed messages from the queue (i.e. only the ones the system intends to retry later)" >> ~/Readme.md +echo "postsuper -d ALL deferred" >> ~/Readme.md +echo "" >> ~/Readme.md ##----------## # MOTD #