Browse Source

Fixes for jitsi-meet-tokens Debian package.

j8
paweldomas 9 years ago
parent
commit
ca89b59638

+ 5
- 4
debian/jitsi-meet-tokens.postinst View File

59
         if [ -f "$PROSODY_HOST_CONFIG" ] ; then
59
         if [ -f "$PROSODY_HOST_CONFIG" ] ; then
60
             if grep -q "plugin_paths" "$PROSODY_HOST_CONFIG"; then
60
             if grep -q "plugin_paths" "$PROSODY_HOST_CONFIG"; then
61
                 # enable tokens in prosody host config
61
                 # enable tokens in prosody host config
62
-                sed -i "s/--plugin_paths/plugin_paths/g" $PROSODY_HOST_CONFIG
62
+                sed -i 's/--plugin_paths/plugin_paths/g' $PROSODY_HOST_CONFIG
63
                 sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
63
                 sed -i 's/authentication = "anonymous"/authentication = "token"/g' $PROSODY_HOST_CONFIG
64
-                sed -i "s/--app_id=example_app_id/app_id=$APP_ID/g" $PROSODY_HOST_CONFIG
65
-                sed -i "s/--app_secret=example_app_secret/app_secret=$APP_SECRET/g" $PROSODY_HOST_CONFIG
66
-                sed -i 's/--modules_enabled = { "token_verification" }/modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
64
+                sed -i 's/ --allow_unencrypted_plain_auth/ allow_unencrypted_plain_auth/g' $PROSODY_HOST_CONFIG
65
+                sed -i "s/ --app_id=example_app_id/ app_id=$APP_ID/g" $PROSODY_HOST_CONFIG
66
+                sed -i "s/ --app_secret=example_app_secret/ app_secret=$APP_SECRET/g" $PROSODY_HOST_CONFIG
67
+                sed -i 's/ --modules_enabled = { "token_verification" }/ modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
67
 
68
 
68
             else
69
             else
69
                 echo "Failed apply auto-config to $PROSODY_HOST_CONFIG which most likely comes from not supported version of jitsi-meet"
70
                 echo "Failed apply auto-config to $PROSODY_HOST_CONFIG which most likely comes from not supported version of jitsi-meet"

+ 5
- 4
debian/jitsi-meet-tokens.postrm View File

37
             APP_SECRET=$RET
37
             APP_SECRET=$RET
38
 
38
 
39
             # Revert prosody config
39
             # Revert prosody config
40
-            sed -i "s/plugin_paths/--plugin_paths/g" $PROSODY_HOST_CONFIG
40
+            sed -i 's/plugin_paths/--plugin_paths/g' $PROSODY_HOST_CONFIG
41
             sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
41
             sed -i 's/authentication = "token"/authentication = "anonymous"/g' $PROSODY_HOST_CONFIG
42
-            sed -i "s/app_id=$APP_ID/--app_id=example_app_id/g" $PROSODY_HOST_CONFIG
43
-            sed -i "s/app_secret=$APP_SECRET/--app_secret=example_app_secret/g" $PROSODY_HOST_CONFIG
44
-            sed -i 's/modules_enabled = { "token_verification" }/--modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
42
+            sed -i 's/ allow_unencrypted_plain_auth/ --allow_unencrypted_plain_auth/g' $PROSODY_HOST_CONFIG
43
+            sed -i "s/ app_id=$APP_ID/ --app_id=example_app_id/g" $PROSODY_HOST_CONFIG
44
+            sed -i "s/ app_secret=$APP_SECRET/ --app_secret=example_app_secret/g" $PROSODY_HOST_CONFIG
45
+            sed -i 's/ modules_enabled = { "token_verification" }/ --modules_enabled = { "token_verification" }/g' $PROSODY_HOST_CONFIG
45
 
46
 
46
             if [ -x "/etc/init.d/prosody" ]; then
47
             if [ -x "/etc/init.d/prosody" ]; then
47
                 invoke-rc.d prosody reload
48
                 invoke-rc.d prosody reload

+ 2
- 1
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example View File

4
 VirtualHost "jitmeet.example.com"
4
 VirtualHost "jitmeet.example.com"
5
         -- enabled = false -- Remove this line to enable this host
5
         -- enabled = false -- Remove this line to enable this host
6
         authentication = "anonymous"
6
         authentication = "anonymous"
7
-        -- Two properties below get uncommented by jitsi-meet-tokens package config
7
+        -- Three properties below get uncommented by jitsi-meet-tokens package config
8
         -- and authentication above is switched to "token"
8
         -- and authentication above is switched to "token"
9
+        --allow_unencrypted_plain_auth = true;
9
         --app_id=example_app_id
10
         --app_id=example_app_id
10
         --app_secret=example_app_secret
11
         --app_secret=example_app_secret
11
         -- Assign this host a certificate for TLS, otherwise it would use the one
12
         -- Assign this host a certificate for TLS, otherwise it would use the one

Loading…
Cancel
Save