瀏覽代碼

Merge branch 'master' of github.com:jitsi/jitsi-meet

master
hristoterezov 10 年之前
父節點
當前提交
aa7f0c8a0b
共有 2 個檔案被更改,包括 2 行新增3 行删除
  1. 1
    1
      debian/jitsi-meet-prosody.postinst
  2. 1
    2
      doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

+ 1
- 1
debian/jitsi-meet-prosody.postinst 查看文件

62
         if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "VirtualHost \"auth.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG; then
62
         if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "VirtualHost \"auth.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG; then
63
             echo -e "\nVirtualHost \"auth.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
63
             echo -e "\nVirtualHost \"auth.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
64
             echo -e "        authentication = \"internal_plain\"\n" >> $PROSODY_HOST_CONFIG
64
             echo -e "        authentication = \"internal_plain\"\n" >> $PROSODY_HOST_CONFIG
65
-            echo -e "admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\" }\n" >> $PROSODY_HOST_CONFIG
65
+            sed -i "s/Component \"conference.$JVB_HOSTNAME\" \"muc\"/Component \"conference.$JVB_HOSTNAME\" \"muc\"\nadmins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\" }\n/g" $PROSODY_HOST_CONFIG
66
             echo -e "Component \"focus.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
66
             echo -e "Component \"focus.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
67
             echo -e "    component_secret=\"$JICOFO_SECRET\"\n" >> $PROSODY_HOST_CONFIG
67
             echo -e "    component_secret=\"$JICOFO_SECRET\"\n" >> $PROSODY_HOST_CONFIG
68
             PROSODY_CREATE_JICOFO_USER="true"
68
             PROSODY_CREATE_JICOFO_USER="true"

+ 1
- 2
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example 查看文件

16
         }
16
         }
17
 
17
 
18
 Component "conference.jitmeet.example.com" "muc"
18
 Component "conference.jitmeet.example.com" "muc"
19
+admins = { "focusUser@auth.jitmeet.example.com" }
19
 
20
 
20
 Component "jitsi-videobridge.jitmeet.example.com"
21
 Component "jitsi-videobridge.jitmeet.example.com"
21
     component_secret = "jitmeetSecret"
22
     component_secret = "jitmeetSecret"
23
 VirtualHost "auth.jitmeet.example.com"
24
 VirtualHost "auth.jitmeet.example.com"
24
         authentication = "internal_plain"
25
         authentication = "internal_plain"
25
 
26
 
26
-admins = { "focusUser@auth.jitmeet.example.com" }
27
-
28
 Component "focus.jitmeet.example.com"
27
 Component "focus.jitmeet.example.com"
29
     component_secret = "focusSecret"
28
     component_secret = "focusSecret"

Loading…
取消
儲存