diff --git a/config/sender.toml b/config/sender.toml index a0832dca..ea60c729 100644 --- a/config/sender.toml +++ b/config/sender.toml @@ -12,4 +12,4 @@ collection="zone-queue" # Hashing secret for loop detection # Must be shared with haraka-plugin-wildduck # If not set then looping is not tracked -loopSecret="" \ No newline at end of file +#loopSecret="secret value" \ No newline at end of file diff --git a/setup/07_install_wildduck.sh b/setup/07_install_wildduck.sh index 072df9f9..61043191 100755 --- a/setup/07_install_wildduck.sh +++ b/setup/07_install_wildduck.sh @@ -53,6 +53,7 @@ group=\"wildduck\" emailDomain=\"$MAILDOMAIN\"" | cat - /etc/wildduck/wildduck.toml > temp && mv temp /etc/wildduck/wildduck.toml sed -i -e "s/localhost:3000/$HOSTNAME/g;s/localhost/$HOSTNAME/g;s/2587/587/g" /etc/wildduck/wildduck.toml +sed -i -e "s/secret value/$SRS_SECRET/g;s/#loopSecret/loopSecret/g" /etc/wildduck/sender.toml cd /opt/wildduck npm install --production --unsafe-perm --no-optional --no-package-lock --no-audit --ignore-scripts --no-shrinkwrap diff --git a/setup/08_install_haraka.sh b/setup/08_install_haraka.sh index d742c465..6ebaf908 100755 --- a/setup/08_install_haraka.sh +++ b/setup/08_install_haraka.sh @@ -99,7 +99,7 @@ virus=true error=false' > config/clamd.ini cp plugins/wildduck/config/wildduck.yaml config/wildduck.yaml -sed -i -e "s/secret value/$SRS_SECRET/g" config/wildduck.yaml +sed -i -e "s/secret value/$SRS_SECRET/g;s/#loopSecret/loopSecret/g" config/wildduck.yaml # Ensure required files and permissions echo "d /opt/haraka 0755 deploy deploy" > /etc/tmpfiles.d/haraka.conf