From 1d9ca94cc60825f7047a010e04f57c1e1e1b0153 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Jul 2023 15:09:51 +0000 Subject: [PATCH] Added subdomain support in convertdomain --- bin/convertdomain | 105 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 7 deletions(-) diff --git a/bin/convertdomain b/bin/convertdomain index 192b460..2f5e57a 100755 --- a/bin/convertdomain +++ b/bin/convertdomain @@ -53,7 +53,11 @@ do_serviceprep() { # Remove first lines of ldap config, replace dc= with new domain, replace domain name sed -n '/^dn: ou=people,dc=federatedcomputer,dc=cloud$/,$p' /federated/apps/ldap/data/root/convertdomain.ldif > /federated/apps/ldap/data/root/convertdomain1.ldif - sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/ldap/data/root/convertdomain1.ldif + if [ "${#DOMAIN_ARRAY[@]}" -eq "3" ]; then + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_MIDDLE,dc=$DOMAIN_LAST#g" /federated/apps/ldap/data/root/convertdomain1.ldif + else + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/ldap/data/root/convertdomain1.ldif + fi sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/ldap/data/root/convertdomain1.ldif } convert_powerdns() { @@ -184,7 +188,12 @@ convert_mail() { sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/mail/docker-compose.yml sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/mail/.env cp /federated/certs/certs/$DOMAIN_NEW.crt /federated/certs/private/$DOMAIN_NEW.key /federated/apps/mail/data/root/certs/ - sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/mail/.env + + if [ "${#DOMAIN_ARRAY[@]}" -eq "3" ]; then + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_MIDDLE,dc=$DOMAIN_LAST#g" /federated/apps/mail/.env + else + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/mail/.env + fi # Grab the container IP from docker-compose SERVICE_IP=`grep ipv4_address /federated/apps/mail/docker-compose.yml | awk '{ print $2 }'` @@ -304,6 +313,76 @@ convert_nextcloud() { } EOF +if [ "${#DOMAIN_ARRAY[@]}" -eq "3" ]; then +cat > /federated/apps/nextcloud/data/config.sh < /federated/apps/nextcloud/data/config.sh <\"#g" /federated/apps/matrix/data/matrix/homeserver.yaml @@ -490,7 +574,11 @@ convert_panel() { sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/panel/docker-compose.yml sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/panel/.env - sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/panel/.env + if [ "${#DOMAIN_ARRAY[@]}" -eq "3" ]; then + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_MIDDLE,dc=$DOMAIN_LAST#g" /federated/apps/panel/.env + else + sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/panel/.env + fi sed -i "s#SITE_NAME=.*#SITE_NAME=$ORG_NEW Panel#g" /federated/apps/panel/.env # Grab the container IP from docker-compose @@ -525,7 +613,11 @@ convert_jitsi() { sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/jitsi/docker-compose.yml sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/jitsi/.env - sed -i "s#DC=federatedcomputer,DC=cloud#DC=$DOMAIN_FIRST,DC=$DOMAIN_LAST#g" /federated/apps/jitsi/.env + if [ "${#DOMAIN_ARRAY[@]}" -eq "3" ]; then + sed -i "s#DC=federatedcomputer,DC=cloud#DC=$DOMAIN_FIRST,DC=$DOMAIN_MIDDLE,DC=$DOMAIN_LAST#g" /federated/apps/jitsi/.env + else + sed -i "s#DC=federatedcomputer,DC=cloud#DC=$DOMAIN_FIRST,DC=$DOMAIN_LAST#g" /federated/apps/jitsi/.env + fi start_service_convert "jitsi" "nc -z 172.99.0.25 443 &> /dev/null" @@ -620,7 +712,7 @@ LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret` echo -ne "\n\nConverting Federated Core $DOMAIN to $DOMAIN_NEW.\n\n" -check_gluerecords +#check_gluerecords do_serviceprep # Stop all services @@ -643,4 +735,3 @@ convert_jitsi convert_baserow convert_gitea convert_caddy -