From 022996a48fd4ffcb251610c1b1e1edc8c0656aa1 Mon Sep 17 00:00:00 2001
From: root <root@f11362a1.federatedcomputer.cloud>
Date: Fri, 15 Dec 2023 12:28:15 +0000
Subject: [PATCH] Fixed DOMAIN to DOMAIN_NEW on espocrm convert

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

diff --git a/bin/convertdomain b/bin/convertdomain
index 83bbf39..8c94bab 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -926,8 +926,8 @@ services:
   espocrm:
     image: espocrm/espocrm:\${IMAGE_VERSION}
     container_name: espocrm
-    hostname: espocrm.$DOMAIN
-    domainname: $DOMAIN
+    hostname: espocrm.$DOMAIN_NEW
+    domainname: $DOMAIN_NEW
     restart: always
     networks:
       federated:
@@ -938,7 +938,7 @@ services:
       - ./data/var/www/html:/var/www/html
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.espocrm.rule=Host(\`espocrm.$DOMAIN\`)"
+      - "traefik.http.routers.espocrm.rule=Host(\`espocrm.$DOMAIN_NEW\`)"
       - "traefik.http.routers.espocrm.entrypoints=websecure"
       - "traefik.http.routers.espocrm.tls.certresolver=letsencrypt"
 
@@ -951,19 +951,19 @@ ESPOCRM_SECRET=$(create_password);
 
 cat > /federated/apps/espocrm/.env <<EOF
 IMAGE_VERSION="8.0.5-apache"
-ESPOCRM_DATABASE_HOST=pdnsmysql.$DOMAIN
+ESPOCRM_DATABASE_HOST=pdnsmysql.$DOMAIN_NEW
 ESPOCRM_DATABASE_NAME=espocrm
 ESPOCRM_DATABASE_USER=espocrm
 ESPOCRM_DATABASE_PASSWORD=$ESPOCRM_SECRET
-ESPOCRM_ADMIN_USERNAME=admin@$DOMAIN
+ESPOCRM_ADMIN_USERNAME=admin@$DOMAIN_NEW
 ESPOCRM_ADMIN_PASSWORD=$ADMINPASS
 ESPOCRM_CONFIG_SMTP_PORT=587
 ESPOCRM_CONFIG_SMTP_AUTH=true
 ESPOCRM_CONFIG_SMTP_SECURITY=TLS
 ESPOCRM_CONFIG_SMTP_USERNAME=$SMTPUSER
 ESPOCRM_CONFIG_SMTP_PASSWORD=$ADMINPASS
-ESPOCRM_CONFIG_SMTP_SERVER=mail.$DOMAIN
-ESPOCRM_CONFIG_OUTBOUND_EMAIL_FROM_ADDRESS=espocrm@$DOMAIN
+ESPOCRM_CONFIG_SMTP_SERVER=mail.$DOMAIN_NEW
+ESPOCRM_CONFIG_OUTBOUND_EMAIL_FROM_ADDRESS=espocrm@$DOMAIN_NEW
 ESPOCRM_CONFIG_AUTHENTICATION_METHOD=LDAP
 ESPOCRM_CONFIG_LDAP_USER_NAME_ATTRIBUTE=mail
 ESPOCRM_CONFIG_LDAP_USER_FIRST_NAME_ATTRIBUTE=givenName
@@ -972,7 +972,7 @@ ESPOCRM_CONFIG_LDAP_USER_TITLE_ATTRIBUTE=cn
 ESPOCRM_CONFIG_LDAP_USER_EMAIL_ADDRESS_ATTRIBUTE=mail
 ESPOCRM_CONFIG_LDAP_USER_PHONE_NUMBER_ATTRIBUTE=cn
 ESPOCRM_CONFIG_LDAP_USER_OBJECT_CLASS=inetOrgPerson
-ESPOCRM_CONFIG_LDAP_HOST=ldap.$DOMAIN
+ESPOCRM_CONFIG_LDAP_HOST=ldap.$DOMAIN_NEW
 ESPOCRM_CONFIG_LDAP_PORT=636
 ESPOCRM_CONFIG_LDAP_SECURITY=SSL
 ESPOCRM_CONFIG_LDAP_AUTH=true
@@ -983,7 +983,7 @@ ESPOCRM_CONFIG_LDAP_BASE_DN=dc=federatedcomputer,dc=cloud
 ESPOCRM_CONFIG_LDAP_BIND_REQUIRES_DN=true
 ESPOCRM_CONFIG_LDAP_CREATE_ESPO_USER=true
 ESPOCRM_CONFIG_LDAP_PORTAL_USER_LDAP_AUTH=true
-ESPOCRM_SITE_URL="https://espocrm.$DOMAIN"
+ESPOCRM_SITE_URL="https://espocrm.$DOMAIN_NEW"
 EOF
 chmod 600 /federated/apps/espocrm/.env