소스 검색

Migrate to using mucs for jvb.

master
damencho 5 년 전
부모
커밋
d9282f873c
2개의 변경된 파일20개의 추가작업 그리고 4개의 파일을 삭제
  1. 12
    1
      debian/jitsi-meet-prosody.postinst
  2. 8
    3
      doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

+ 12
- 1
debian/jitsi-meet-prosody.postinst 파일 보기

95
             mkdir -p /etc/prosody/conf.d/
95
             mkdir -p /etc/prosody/conf.d/
96
             cp /usr/share/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
96
             cp /usr/share/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
97
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
97
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
98
-            sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG
99
             sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
98
             sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
100
             sed -i "s/focusUser/$JICOFO_AUTH_USER/g" $PROSODY_HOST_CONFIG
99
             sed -i "s/focusUser/$JICOFO_AUTH_USER/g" $PROSODY_HOST_CONFIG
101
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
100
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
116
             PROSODY_CONFIG_PRESENT="false"
115
             PROSODY_CONFIG_PRESENT="false"
117
         fi
116
         fi
118
 
117
 
118
+        # we always try to create the user 'jvb' and not fail configure if user exists
119
+        prosodyctl register jvb $JICOFO_AUTH_DOMAIN $JVB_SECRET || true
120
+
121
+        # Check whether prosody config has the internal muc, if not add it,
122
+        # as we are migrating configs
123
+        if ! grep -q "internal.auth.$JVB_HOSTNAME" $PROSODY_HOST_CONFIG; then
124
+            echo -e "\nComponent \"internal.auth.$JVB_HOSTNAME\" \"muc\"" >> $PROSODY_HOST_CONFIG
125
+            echo -e "    storage = \"null\"" >> $PROSODY_HOST_CONFIG
126
+            echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
127
+            echo -e "    admins = { \"focusUser@auth.jitmeet.example.com\", \"jvb@auth.jitmeet.example.com\" }" >> $PROSODY_HOST_CONFIG
128
+        fi
129
+
119
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
130
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
120
             # prosodyctl takes care for the permissions
131
             # prosodyctl takes care for the permissions
121
             # echo for using all default values
132
             # echo for using all default values

+ 8
- 3
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example 파일 보기

35
         "muc_domain_mapper";
35
         "muc_domain_mapper";
36
         -- "token_verification";
36
         -- "token_verification";
37
     }
37
     }
38
-admins = { "focusUser@auth.jitmeet.example.com" }
38
+    admins = { "focusUser@auth.jitmeet.example.com" }
39
 
39
 
40
-Component "jitsi-videobridge.jitmeet.example.com"
41
-    component_secret = "jitmeetSecret"
40
+-- internal muc component
41
+Component "internal.auth.jitmeet.example.com" "muc"
42
+    storage = "null"
43
+    modules_enabled = {
44
+      "ping";
45
+    }
46
+    admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
42
 
47
 
43
 VirtualHost "auth.jitmeet.example.com"
48
 VirtualHost "auth.jitmeet.example.com"
44
     authentication = "internal_plain"
49
     authentication = "internal_plain"

Loading…
취소
저장