diff --git a/lib/freescout.sh b/lib/freescout.sh index 4ab0401..712763f 100644 --- a/lib/freescout.sh +++ b/lib/freescout.sh @@ -4,9 +4,10 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin get_appvars +. /etc/federated config_freescout() { - echo -ne "\n* Configuring freescout container.." + echo -ne "* Configuring freescout container.." if [ ! -d "/federated/apps/freescout" ]; then mkdir -p /federated/apps/freescout/data/data @@ -14,7 +15,6 @@ config_freescout() { fi cat > /federated/apps/freescout/docker-compose.yml < /federated/apps/freescout/.env < /dev/null" "7" - docker exec pdns pdnsutil add-record $DOMAIN freescout A 86400 $EXTERNALIP &> /dev/null - [ $? -ne 0 ] && fail "Couldn't add dns record for freescout" + [[ "${PLUS}" != "true" ]] && docker exec pdns pdnsutil add-record $DOMAIN freescout A 86400 $EXTERNALIP &> /dev/null echo -ne "done.\n" } email_freescout() { echo -ne "* Sending email to customer.." - spin & - SPINPID=$! cat > /federated/apps/mail/data/root/certs/mailfile < @@ -157,13 +155,10 @@ EOF docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"Application installed on $DOMAIN\" $EMAIL < /root/certs/mailfile" rm /federated/apps/mail/data/root/certs/mailfile - kill -9 $SPINPID &> /dev/null echo -ne "done.\n" } uninstall_freescout() { echo -ne "* Uninstalling freescout container.." - spin & - SPINPID=$! # First stop the service cd /federated/apps/freescout && docker compose -f docker-compose.yml -p freescout down &> /dev/null @@ -175,6 +170,7 @@ uninstall_freescout() { # Delete the app directory rm -rf /federated/apps/freescout - kill -9 $SPINPID &> /dev/null + [[ "${PLUS}" != "true" ]] && docker exec pdns pdnsutil delete-rrset $DOMAIN freescout A &> /dev/null + echo -ne "done.\n" }