From 3e8bc2cf93b042a050223231c5615f932c516e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@federated.computer>
Date: Wed, 15 Jan 2025 05:17:07 +0100
Subject: [PATCH] migrate from dc=federatedcomputer,dc=cloud unconditionally

---
 bin/convertdomain | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/convertdomain b/bin/convertdomain
index 8c0c234..2287c30 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -81,8 +81,11 @@ convert_generic() {
   #### Conversions that must be done for almost everything
   # FIXME check if Jitsi really needs upper-case DC. If we can use lower case dc like everywhere else,
   # we can avoid generating DOMAIN_NEW_LDAP_DC
-  sed -i "s#$DOMAIN#$DOMAIN_NEW#g;s#$DOMAIN_LDAP_dc#$DOMAIN_NEW_LDAP_dc#g;s#$DOMAIN_LDAP_DC#$DOMAIN_NEW_LDAP_DC#g" /federated/apps/$1/docker-compose.yml
-  [ -e /federated/apps/$1/.env ] && sed -i "s#$DOMAIN#$DOMAIN_NEW#g;s#$DOMAIN_LDAP_dc#$DOMAIN_NEW_LDAP_dc#g;s#$DOMAIN_LDAP_DC#$DOMAIN_NEW_LDAP_DC#g" /federated/apps/$1/.env
+  # dc=federatedcomputer,dc=cloud is hardcoded for some stuff in initial
+  # core creation even if the original domain isn't under federatedcomputer.cloud,
+  # so let's migrate from that unconditionally
+  sed -i "s#$DOMAIN#$DOMAIN_NEW#g;s#$DOMAIN_LDAP_dc#$DOMAIN_NEW_LDAP_dc#g;s#$DOMAIN_LDAP_DC#$DOMAIN_NEW_LDAP_DC#g;s#dc=federatedcomputer,dc=cloud#$DOMAIN_NEW_LDAP_dc#g" /federated/apps/$1/docker-compose.yml
+  [ -e /federated/apps/$1/.env ] && sed -i "s#$DOMAIN#$DOMAIN_NEW#g;s#$DOMAIN_LDAP_dc#$DOMAIN_NEW_LDAP_dc#g;s#$DOMAIN_LDAP_DC#$DOMAIN_NEW_LDAP_DC#g;s#dc=federatedcomputer,dc=cloud#$DOMAIN_NEW_LDAP_dc#g" /federated/apps/$1/.env
 }
 convert_calcom() {
   echo -ne "\n* Converting calcom..."