浏览代码

Update prosody modules

Bob Mottram 7 年前
父节点
当前提交
d514414ff9
共有 3 个文件被更改,包括 11 次插入42 次删除
  1. 二进制
      image_build/prosody-modules-20170514.tar.gz
  2. 二进制
      image_build/prosody-modules-20180104.tar.gz
  3. 11
    42
      src/freedombone-app-xmpp

二进制
image_build/prosody-modules-20170514.tar.gz 查看文件


二进制
image_build/prosody-modules-20180104.tar.gz 查看文件


+ 11
- 42
src/freedombone-app-xmpp 查看文件

47
 prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz"
47
 prosody_nightly_url="https://prosody.im/nightly/${prosody_latest_version}/latest/${prosody_filename}.tar.gz"
48
 
48
 
49
 # From https://hg.prosody.im/prosody-modules
49
 # From https://hg.prosody.im/prosody-modules
50
-prosody_modules_filename='prosody-modules-20170514.tar.gz'
51
-prosody_modules_hash='ef404c203317cc0de6da7aaec4f21765a57f630adfbf082cf2dd92b881c15f86'
50
+prosody_modules_filename='prosody-modules-20180104.tar.gz'
51
+prosody_modules_hash='7c81b4ed8a90130b4db5902dc1f299ad1c4dab57a0970552b71cb2042a490bc1'
52
 
52
 
53
 xmpp_variables=(ONION_ONLY
53
 xmpp_variables=(ONION_ONLY
54
                 INSTALLED_WITHIN_DOCKER
54
                 INSTALLED_WITHIN_DOCKER
326
         return
326
         return
327
     fi
327
     fi
328
 
328
 
329
-    # This module is a workaround for OMEMO within group chat
330
-    # See https://github.com/iNPUTmice/omemo_all_access
331
-    if [ -f ~/freedombone/image_build/mod_omemo_all_access.lua ]; then
332
-        if [ ! -d /var/lib/prosody/prosody-modules ]; then
333
-            mkdir -p /var/lib/prosody/prosody-modules
334
-        fi
335
-
336
-        copy_omemo_all_access=1
337
-        if [ -f /usr/lib/prosody/modules/mod_omemo_all_access.lua ]; then
338
-            curr_hash=$(sha256sum /usr/lib/prosody/modules/mod_omemo_all_access.lua)
339
-            new_hash=$(sha256sum ~/freedombone/image_build/mod_omemo_all_access.lua)
340
-            if [[ "$curr_hash" == "$new_hash" ]]; then
341
-                copy_omemo_all_access=
342
-            fi
343
-        fi
344
-
345
-        if [ $copy_omemo_all_access ]; then
346
-            systemctl stop prosody
347
-            cp ~/freedombone/image_build/mod_omemo_all_access.lua /var/lib/prosody/prosody-modules/mod_omemo_all_access.lua
348
-            cp ~/freedombone/image_build/mod_omemo_all_access.lua /usr/lib/prosody/modules/mod_omemo_all_access.lua
349
-
350
-            chmod +x /var/lib/prosody/prosody-modules/mod_omemo_all_access.lua
351
-            chmod +x /usr/lib/prosody/modules/mod_omemo_all_access.lua
352
-
353
-            if ! grep -q "omemo_all_access" /etc/prosody/prosody.cfg.lua; then
354
-                sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/prosody.cfg.lua
355
-                sed -i 's|"omemo_all_access";|  "omemo_all_access";|g' /etc/prosody/prosody.cfg.lua
356
-            fi
357
-
358
-            if ! grep -q "omemo_all_access" /etc/prosody/conf.avail/xmpp.cfg.lua; then
359
-                sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/conf.avail/xmpp.cfg.lua
360
-                sed -i 's|"omemo_all_access";|  "omemo_all_access";|g' /etc/prosody/conf.avail/xmpp.cfg.lua
361
-            fi
362
-
363
-            chown -R prosody:prosody /var/lib/prosody/prosody-modules
364
-            chown -R prosody:prosody /usr/lib/prosody/modules
365
-            systemctl start prosody
366
-        fi
367
-    fi
368
-
369
     if [ ! -f $INSTALL_DIR/$prosody_modules_filename ]; then
329
     if [ ! -f $INSTALL_DIR/$prosody_modules_filename ]; then
370
         # Obtain the modules
330
         # Obtain the modules
371
         if [ -f ~/freedombone/image_build/$prosody_modules_filename ]; then
331
         if [ -f ~/freedombone/image_build/$prosody_modules_filename ]; then
413
         sed -i '/"pep"/a "vcard";' /etc/prosody/prosody.cfg.lua
373
         sed -i '/"pep"/a "vcard";' /etc/prosody/prosody.cfg.lua
414
         systemctl start prosody
374
         systemctl start prosody
415
     fi
375
     fi
376
+    if ! grep -q "omemo_all_access" /etc/prosody/prosody.cfg.lua; then
377
+        sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/prosody.cfg.lua
378
+        sed -i 's|"omemo_all_access";|  "omemo_all_access";|g' /etc/prosody/prosody.cfg.lua
379
+    fi
380
+
381
+    if ! grep -q "omemo_all_access" /etc/prosody/conf.avail/xmpp.cfg.lua; then
382
+        sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/conf.avail/xmpp.cfg.lua
383
+        sed -i 's|"omemo_all_access";|  "omemo_all_access";|g' /etc/prosody/conf.avail/xmpp.cfg.lua
384
+    fi
416
 }
385
 }
417
 
386
 
418
 function prosody_daemon_restart_script {
387
 function prosody_daemon_restart_script {