From 7107ce8a18426cd438928b61aadeb79c3b696aa3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Jan 2025 16:37:48 +0000 Subject: [PATCH] Fixes for castopod Plus provisions --- lib/castopod.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/castopod.sh b/lib/castopod.sh index ef9c275..921673f 100644 --- a/lib/castopod.sh +++ b/lib/castopod.sh @@ -6,7 +6,7 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb get_appvars config_castopod() { - echo -ne "\n* Configuring /federated/apps/castopod container.." + echo -ne "* Configuring castopod container.." if [ ! -d "/federated/apps/castopod" ]; then mkdir -p /federated/apps/castopod/data/var/www/castopod/public/media @@ -14,8 +14,6 @@ config_castopod() { fi cat > /federated/apps/castopod/docker-compose.yml < /federated/apps/castopod/.env < /dev/null rm /tmp/cp-cookies + if [[ "${PLUS}" != "true" ]]; then + docker exec pdns pdnsutil add-record $DOMAIN castopod A 86400 $EXTERNALIP &> /dev/null + docker exec pdns pdnsutil add-record $DOMAIN podcasts A 86400 $EXTERNALIP &> /dev/null + fi + echo -ne "done." } email_castopod() { echo -ne "* Sending email to customer.." - spin & - SPINPID=$! cat > /federated/apps/mail/data/root/certs/mailfile < @@ -159,13 +162,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_castopod() { echo -ne "* Uninstalling castopod container.." - spin & - SPINPID=$! # First stop the service cd /federated/apps/castopod && docker compose -f docker-compose.yml -p castopod down &> /dev/null @@ -174,9 +174,11 @@ uninstall_castopod() { docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database castopod;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop user castopod;'" &> /dev/null + docker exec pdns pdnsutil delete-rrset $DOMAIN castopod A + docker exec pdns pdnsutil delete-rrset $DOMAIN podcasts A + # Delete the app directory rm -rf /federated/apps/castopod - kill -9 $SPINPID &> /dev/null echo -ne "done.\n" }