From db83ccbf43eacf9d05e1396b2aa4414cc16f7257 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Jun 2023 13:15:09 +0000 Subject: [PATCH] Fixed mail opendkim and listmonk redirects --- lib/listmonk.sh | 8 ++++---- lib/mail.sh | 4 ++++ lib/wireguard.sh | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/listmonk.sh b/lib/listmonk.sh index 632cdf3..4249503 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -73,12 +73,12 @@ echo -ne "done." } start_listmonk() { # Install the database scheme first - docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes + docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null # Change app.root_url and other settings to our domain - docker exec -it postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" - docker exec -it postgresql psql -U listmonk -c "update settings set value='\"listmonk \"' where key='app.from_email'" - docker exec -it postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"admin\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" + docker exec -it postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null + docker exec -it postgresql psql -U listmonk -c "update settings set value='\"listmonk \"' where key='app.from_email'" &> /dev/null + docker exec -it postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"admin\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null # Grab the container IP from docker-compose above SERVICE_IP=`grep ipv4_address /federated/apps/listmonk/docker-compose.yml | awk '{ print $2 }'` diff --git a/lib/mail.sh b/lib/mail.sh index 9a1594f..a028d6a 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -177,6 +177,10 @@ start_mail() { docker exec -it pdns pdnsutil add-record $DOMAIN _dmarc TXT 86400 "\"v=DMARC1; p=quarantine; rua=mailto:admin@$DOMAIN; ruf=mailto:admin@$DOMAIN; sp=none; ri=86400\"" &> /dev/null [ $? -ne 0 ] && fail "Couldn't insert DMARC record into /federated/apps/pdns container" + # Stop and Start mail to reload DKIM + /federated/bin/stop mail &> /dev/null + /federated/bin/start mail &> /dev/null + kill -9 $SPINPID &> /dev/null echo -ne "done." } diff --git a/lib/wireguard.sh b/lib/wireguard.sh index 04527f0..d37cd5d 100644 --- a/lib/wireguard.sh +++ b/lib/wireguard.sh @@ -57,7 +57,7 @@ LOG_CONFS=true EOF chmod 600 /federated/apps/wireguard/.env -cat /federated/apps/wireguard/data/config/coredns/Corefile < /federated/apps/wireguard/data/config/coredns/Corefile <