Added fix for MSP and convertdomain MSP

bin/convertdomain

@@ -891,6 +891,21 @@ convert_freescout() {
 
   echo -ne "done."
 }
+convert_msp() {
+  #### Convert MSP
+  echo -ne "\n* Converting msp.."
+
+  sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/msp/docker-compose.yml
+  sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/msp/.env
+
+  # Grab the container IP from docker-compose
+  SERVICE_IP=`grep ipv4_address /federated/apps/msp/docker-compose.yml | awk '{ print $2 }'`
+
+  # Start service with command to make sure it's up before proceeding
+  start_service_convert "msp" "nc -z $SERVICE_IP 3000 &> /dev/null"
+
+  echo -ne "done."
+}
 usage() {
   echo "$0: <domain.com> <organization name>"
   exit 2

bin/install-federated

@@ -19,33 +19,6 @@ get_config() {
 #    fi
 #  done
 
-#  . /federated/lib/pdnsmysql.sh
-#  . /federated/lib/pdns.sh
-#  . /federated/lib/pdnsadmin.sh
-#  . /federated/lib/traefik.sh
-#  . /federated/lib/postgresql.sh
-#  . /federated/lib/ldap.sh
-#  . /federated/lib/mail.sh
-#  . /federated/lib/collabora.sh
-#  . /federated/lib/nextcloud.sh
-#  . /federated/lib/matrix.sh
-#  . /federated/lib/element.sh
-#  . /federated/lib/jitsi.sh
-#  . /federated/lib/listmonk.sh
-#  . /federated/lib/vaultwarden.sh
-#  . /federated/lib/panel.sh
-#  . /federated/lib/wireguard.sh
-#  . /federated/lib/baserow.sh
-#  . /federated/lib/gitea.sh
-#  . /federated/lib/caddy.sh
-#  . /federated/lib/autodiscover.sh
-#  . /federated/lib/castopod.sh
-#  . /federated/lib/wordpress.sh
-#  . /federated/lib/coturn.sh
-#  . /federated/lib/bookstack.sh
-#  . /federated/lib/freescout.sh
-#  . /federated/lib/msp.sh
-  
   COUNTRIES=("AF" "AL" "DZ" "AS" "AD" "AO" "AI" "AQ" "AG" "AR" "AM" "AW" "AU" "AT" "AZ" "BS" "BH" "BD" "BB" "BY" "BE" "BZ" "BJ" "BM" "BT" "BO" "BO" "BA" "BW" "BV" "BR" "IO" "BN" "BN" "BG" "BF" "BI" "KH" "CM" "CA" "CV" "KY" "CF" "TD" "CL" "CN" "CX" "CC" "CO" "KM" "CG" "CD" "CK" "CR" "CI" "CI" "HR" "CU" "CY" "CZ" "DK" "DJ" "DM" "DO" "EC" "EG" "SV" "GQ" "ER" "EE" "ET" "FK" "FO" "FJ" "FI" "FR" "GF" "PF" "TF" "GA" "GM" "GE" "DE" "GH" "GI" "GR" "GL" "GD" "GP" "GU" "GT" "GG" "GN" "GW" "GY" "HT" "HM" "VA" "HN" "HK" "HU" "IS" "IN" "ID" "IR" "IQ" "IE" "IM" "IL" "IT" "JM" "JP" "JE" "JO" "KZ" "KE" "KI" "KP" "KR" "KR" "KW" "KG" "LA" "LV" "LB" "LS" "LR" "LY" "LY" "LI" "LT" "LU" "MO" "MK" "MG" "MW" "MY" "MV" "ML" "MT" "MH" "MQ" "MR" "MU" "YT" "MX" "FM" "MD" "MC" "MN" "ME" "MS" "MA" "MZ" "MM" "MM" "NA" "NR" "NP" "NL" "AN" "NC" "NZ" "NI" "NE" "NG" "NU" "NF" "MP" "NO" "OM" "PK" "PW" "PS" "PA" "PG" "PY" "PE" "PH" "PN" "PL" "PT" "PR" "QA" "RE" "RO" "RU" "RU" "RW" "SH" "KN" "LC" "PM" "VC" "VC" "VC" "WS" "SM" "ST" "SA" "SN" "RS" "SC" "SL" "SG" "SK" "SI" "SB" "SO" "ZA" "GS" "SS" "ES" "LK" "SD" "SR" "SJ" "SZ" "SE" "CH" "SY" "TW" "TW" "TJ" "TZ" "TH" "TL" "TG" "TK" "TO" "TT" "TN" "TR" "TM" "TC" "TV" "UG" "UA" "AE" "GB" "US" "UM" "UY" "UZ" "VU" "VE" "VE" "VN" "VN" "VG" "VI" "WF" "EH" "YE" "ZM" "ZW")
 
   if [ -f "/etc/federated" ]; then

lib/msp.sh

@@ -43,7 +43,7 @@ services:
       - "traefik.http.routers.msp.tls.certresolver=letsencrypt"
       - "traefik.http.services.msp.loadbalancer.server.port=3000"
       - "traefik.http.routers.msp.middlewares=msp-auth"
-      - "traefik.http.middlewares.msp-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING_MSP
+      - "traefik.http.middlewares.msp-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING_MSP"
       - "traefik.http.routers.mspnew.rule=Host(\`msp.$DOMAIN\`) && PathPrefix(\`/albums\`)"
       - "traefik.http.routers.mspnew.entrypoints=websecure"
       - "traefik.http.routers.mspnew.tls.certresolver=letsencrypt"