bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added re-direct and fixed traefik starting output

Browse Source
This commit is contained in:
Derek Crudgington 2023-05-16 14:22:03 +00:00
parent b5e2d82aff
commit 036d9f9d61
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mail.sh
View File

@ -167,7 +167,7 @@ start_mail() {
[ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/pdns container" [ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/pdns container"
# Insert the DMARC DNS TXT entry into /federated/apps/dns container # Insert the DMARC DNS TXT entry into /federated/apps/dns container
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\"" 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" [ $? -ne 0 ] && fail "Couldn't insert DMARC record into /federated/apps/pdns container"
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null

4
lib/traefik.sh
View File

@ -89,6 +89,10 @@ echo -ne "done."
} }
start_traefik() { start_traefik() {
echo -ne "\n* Starting /federated/apps/dns service.."
spin &
SPINPID=$!
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/traefik with output to console for debug # Start /federated/apps/traefik with output to console for debug
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up