From 8b0aa98709a596c54ed20bb0e3d56d4a7bf4814e Mon Sep 17 00:00:00 2001
From: saint <saint@saint.li>
Date: Thu, 16 Jan 2025 01:35:16 +1100
Subject: [PATCH] A couple of essential changes for nextcloud and bookstack
 upgrade to work

---
 bin/convertdomain | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/convertdomain b/bin/convertdomain
index 2062008..52a9fb8 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -72,6 +72,11 @@ do_serviceprep_ldap() {
   sed -i "s#dc=federatedcomputer,dc=cloud#$DOMAIN_NEW_LDAP_dc#g" /federated/apps/ldap/data/root/convertdomain1.ldif
   sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/ldap/data/root/convertdomain1.ldif
 }
+do_serviceprep_nextcloud() {
+  # Disable Nextcloud LDAP
+  docker exec -u 33 nextcloud /var/www/html/occ -vv ldap:delete-config s01
+  docker exec -u 33 nextcloud /var/www/html/occ app:disable user_ldap
+}
 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,
@@ -112,7 +117,6 @@ convert_pdnsmysql() {
 
   echo -ne "done."
 }
-
 convert_pdns() {
   #### Convert PowerDNS pdns
   echo -ne "\n* Converting pdns.."
@@ -279,10 +283,6 @@ convert_nextcloud() {
   #### Convert Nextcloud
   echo -ne "\n* Converting nextcloud.."
 
-  # Disable Nextcloud LDAP
-  docker exec -u 33 nextcloud /var/www/html/occ -vv ldap:delete-config s01
-  docker exec -u 33 nextcloud /var/www/html/occ app:disable user_ldap
-
   convert_generic nextcloud
   sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/nextcloud/data/var/www/html/config/config.php
 
@@ -439,7 +439,8 @@ EOF
   [ $? -ne 0 ] && fail "Couldn't chown config.sh in /federated/apps/nextcloud container"
 
   # Run config.sh - Setup LDAP, configuration for nextcloud
-  docker exec -u 33 nextcloud /var/www/html/config.sh &> /dev/null
+  # DEBUG  docker exec -u 33 nextcloud /var/www/html/config.sh &> /dev/null
+  docker exec -u 33 nextcloud /var/www/html/config.sh
   [ $? -ne 0 ] && fail "Couldn't run config.sh inside /federated/apps/nextcloud container"
 
   # Add admin user to group
@@ -454,7 +455,7 @@ EOF
   docker exec -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN_NEW mail.$DOMAIN_NEW 993 ssl admin@$DOMAIN_NEW $ADMINPASS mail.$DOMAIN_NEW 465 ssl admin@$DOMAIN_NEW $ADMINPASS password"
 
   # Remove configs
-  rm /federated/apps/nextcloud/data/var/www/html/config.sh /federated/apps/nextcloud/data/var/www/html/configs.json
+  # DEBUG  rm /federated/apps/nextcloud/data/var/www/html/config.sh /federated/apps/nextcloud/data/var/www/html/configs.json
 
   # Configure SSO to Authelia
   NEXTCLOUD_CLIENT_SECRET=$(cat /federated/apps/nextcloud/.nextcloud.client.secret)
@@ -859,7 +860,7 @@ convert_bookstack() {
   LOWER_DOMAIN="$(echo $DOMAIN |tr 'A-Z' 'a-z')"
   LOWER_DOMAIN_NEW="$(echo $DOMAIN_NEW |tr 'A-Z' 'a-z')"
   docker exec pdnsmysql mysql -ubookstack -p${BOOKSTACK_SECRET} bookstack -sN -e "UPDATE users SET email=REPLACE(email, '@$LOWER_DOMAIN', '@$LOWER_DOMAIN_NEW') WHERE email LIKE '%@$LOWER_DOMAIN';";
-  docker exec pdnsmysql mysql -ubookstack -p${BOOKSTACK_SECRET} bookstack -sN -e "UPDATE users SET external_auth_id=REPLACE(external_auth_id, '@$LOWER_DOMAIN', '@$LOWER_DOMAIN_NEW) WHERE external_auth_id LIKE '%@$LOWER_DOMAIN';";
+  docker exec pdnsmysql mysql -ubookstack -p${BOOKSTACK_SECRET} bookstack -sN -e "UPDATE users SET external_auth_id=REPLACE(external_auth_id, '@$LOWER_DOMAIN', '@$LOWER_DOMAIN_NEW') WHERE external_auth_id LIKE '%@$LOWER_DOMAIN';";
 
   # Grab the container IP from docker-compose
   SERVICE_IP=`grep ipv4_address /federated/apps/bookstack/docker-compose.yml | awk '{ print $2 }'`
@@ -1052,6 +1053,7 @@ check_gluerecords
 #get_installedapps
 do_serviceprep_dns
 do_serviceprep_ldap
+do_serviceprep_nextcloud
 
 # Stop all services
 /federated/bin/stop all &> /dev/null