Parcourir la source

Prosody conference domain

Bob Mottram il y a 8 ans
Parent
révision
6d4819ff47
2 fichiers modifiés avec 11 ajouts et 15 suppressions
  1. 0
    15
      src/freedombone-app-xmpp
  2. 11
    0
      src/freedombone-utils-web

+ 0
- 15
src/freedombone-app-xmpp Voir le fichier

@@ -460,21 +460,6 @@ function install_xmpp_main {
460 460
     fi
461 461
     sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/prosody.cfg.lua
462 462
 
463
-    if [ $XMPP_DOMAIN_CODE ]; then
464
-        if [ ${#XMPP_DOMAIN_CODE} -gt 0 ]; then
465
-            if [[ $(cert_exists chat.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
466
-                sed -i 's|--Component "conference.|Component "chat.|g' /etc/prosody/prosody.cfg.lua
467
-            fi
468
-            if [[ $(cert_exists xmpp.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
469
-                sed -i 's|--Component "conference.|Component "xmpp.|g' /etc/prosody/prosody.cfg.lua
470
-            fi
471
-            if [[ $(cert_exists conference.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
472
-                sed -i 's|--Component "conference.|Component "conference.|g' /etc/prosody/prosody.cfg.lua
473
-            fi
474
-        fi
475
-    fi
476
-
477
-
478 463
     update_default_domain
479 464
     touch /home/$MY_USERNAME/README
480 465
 

+ 11
- 0
src/freedombone-utils-web Voir le fichier

@@ -646,6 +646,17 @@ function update_default_domain {
646 646
         if [ ! -d /etc/prosody/certs ]; then
647 647
             mkdir /etc/prosody/certs
648 648
         fi
649
+
650
+        if [[ $(cert_exists chat.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
651
+            sed -i 's|--Component "conference.|Component "chat.|g' /etc/prosody/prosody.cfg.lua
652
+        fi
653
+        if [[ $(cert_exists xmpp.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
654
+            sed -i 's|--Component "conference.|Component "xmpp.|g' /etc/prosody/prosody.cfg.lua
655
+        fi
656
+        if [[ $(cert_exists conference.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
657
+            sed -i 's|--Component "conference.|Component "conference.|g' /etc/prosody/prosody.cfg.lua
658
+        fi
659
+
649 660
         cp /etc/ssl/private/xmpp* /etc/prosody/certs
650 661
         cp /etc/ssl/private/${DEFAULT_DOMAIN_NAME}* /etc/prosody/certs
651 662
         cp /etc/ssl/certs/xmpp* /etc/prosody/certs