From 6e6b4ede6469e4022e3cc6e28f76e8ea3662db95 Mon Sep 17 00:00:00 2001
From: Derek Crudgington <derek@federated.computer>
Date: Thu, 13 Feb 2025 17:02:54 +0000
Subject: [PATCH] Added fixes to convertdomain for plus conversions and
 discourse fixes

---
 bin/convertdomain | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bin/convertdomain b/bin/convertdomain
index 9b96b4e..fb40783 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -895,10 +895,6 @@ convert_discourse() {
 
   convert_generic discourse 
 
-  docker exec postgresql psql -U discourse -c "UPDATE instances SET domain='$DOMAIN_NEW' WHERE domain='$DOMAIN'"
-  docker exec postgresql psql -U plane -c "UPDATE users SET email=REPLACE(email, '@$DOMAIN', '@$DOMAIN_NEW') WHERE email LIKE '%@$DOMAIN'"
-  docker exec postgresql psql -U discourse -c "UPDATE profiles SET company_name='$DOMAIN_NEW' WHERE company_name='$DOMAIN'"
-
   docker exec postgresql psql -U discourse -c "update users set username='admin@$DOMAIN_NEW' where username='admin@$DOMAIN';" &> /dev/null
   docker exec postgresql psql -U discourse -c "update users set username_lower='admin@$DOMAIN_NEW' where username_lower='admin@$DOMAIN';" &> /dev/null
   docker exec postgresql psql -U discourse -c "update site_settings set value='discourse@$DOMAIN_NEW' where name='notification_email';" &> /dev/null
@@ -943,22 +939,27 @@ DOMAIN_LDAP_dc="dc=${DOMAIN//./,dc=}"
 DOMAIN_LDAP_DC="DC=${DOMAIN//./,DC=}"
 
 ADMINPASS=`cat /federated/bin/.adminpass | head -1`
-LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
-
-MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
+[[ -d "/federated/apps/ldap" ]] && LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
+[[ -d "/federated/apps/pdnsmysql" ]] && MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'`
 
 # Set SMTP user based on if fcore exists
-[[ $(docker exec ldap slapcat | grep fcore) ]] && SMTPUSER="fcore" || SMTPUSER="admin"
+if [[ -d "/federated/apps/ldap" ]]; then
+  [[ $(docker exec ldap slapcat | grep fcore) ]] && SMTPUSER="fcore" || SMTPUSER="admin"
+fi
 
 echo -ne "\n\nConverting Federated Core $DOMAIN to $DOMAIN_NEW.\n\n"
 
 # Key initial steps
-if ! $DNS_DONE; then
+if [[ "${PLUS}" != "true" ]]; then
+  if ! $DNS_DONE; then
 	check_gluerecords
-#get_installedapps
 	do_serviceprep_dns
+  fi
+fi
+
+if [[ "${PLUS}" != "true" ]]; then
+  do_serviceprep_ldap
 fi
-do_serviceprep_ldap
 
 # Stop all services
 /federated/bin/stop all &> /dev/null