Browse Source

Adds jicofo debian package integration.

j8
paweldomas 11 years ago
parent
commit
f749bed1dd

+ 1
- 1
config.js View File

13
     useNicks: false,
13
     useNicks: false,
14
     bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that
14
     bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that
15
     clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza
15
     clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza
16
-    focusUserJid: 'focus@auth.pawel.jitsi.net', // The real JID of focus participant
16
+    focusUserJid: 'focus@auth.jitsi-meet.example.com', // The real JID of focus participant
17
     //defaultSipNumber: '', // Default SIP number
17
     //defaultSipNumber: '', // Default SIP number
18
     desktopSharing: 'ext', // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable.
18
     desktopSharing: 'ext', // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable.
19
     chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension
19
     chromeExtensionId: 'diibjkoicjeejcmhdnailmkgecihlobk', // Id of desktop streamer Chrome extension

+ 19
- 0
debian/jitsi-meet-prosody.postinst View File

23
 
23
 
24
         . /etc/jitsi/videobridge/config
24
         . /etc/jitsi/videobridge/config
25
 
25
 
26
+        . /etc/jitsi/jicofo/config
27
+
26
         # loading debconf
28
         # loading debconf
27
         . /usr/share/debconf/confmodule
29
         . /usr/share/debconf/confmodule
28
 
30
 
41
             cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
43
             cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
42
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
44
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
43
             sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG
45
             sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG
46
+            sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
47
+            sed -i "s/focusUser/$JICOFO_AUTH_USER/g" $PROSODY_HOST_CONFIG
44
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
48
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
45
                 ln -s $PROSODY_HOST_CONFIG /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
49
                 ln -s $PROSODY_HOST_CONFIG /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
46
             fi
50
             fi
51
+            # create 'focus@auth.domain' prosody user
52
+            # FIXME this duplicates with below
53
+            prosodyctl register $JICOFO_AUTH_USER $JICOFO_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD
54
+        fi
55
+        # on UPGRADE to server side focus check if focus is configured
56
+        if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "VirtualHost \"auth.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG; then
57
+            echo -e "\nVirtualHost \"auth.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
58
+            echo -e "        authentication = \"internal_plain\"\n" >> $PROSODY_HOST_CONFIG
59
+            echo -e "admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\" }\n" >> $PROSODY_HOST_CONFIG
60
+            echo -e "Component \"focus.$JVB_HOSTNAME\"" >> $PROSODY_HOST_CONFIG
61
+            echo -e "    component_secret=\"$JICOFO_SECRET\"\n" >> $PROSODY_HOST_CONFIG
62
+            # create 'focus@auth.domain' prosody user
63
+            # FIXME this duplicates with above
64
+            prosodyctl register $JICOFO_AUTH_USER $JICOFO_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD
47
         fi
65
         fi
48
 
66
 
49
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
67
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
60
         if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
78
         if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
61
             invoke-rc.d prosody restart
79
             invoke-rc.d prosody restart
62
             invoke-rc.d jitsi-videobridge restart
80
             invoke-rc.d jitsi-videobridge restart
81
+            invoke-rc.d jicofo restart
63
         fi
82
         fi
64
     ;;
83
     ;;
65
 
84
 

+ 8
- 0
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example View File

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

Loading…
Cancel
Save