Procházet zdrojové kódy

make sure extra plugin paths are enabled (#8390)

* fix: Make sure extra plugin_paths are not commented out.

* fix: Do not use "-e" as backup suffix.
master
bgrozev před 4 roky
rodič
revize
d8dd644f38
Žádný účet není propojen s e-mailovou adresou tvůrce revize
1 změnil soubory, kde provedl 8 přidání a 1 odebrání
  1. 8
    1
      debian/jitsi-meet-prosody.postinst

+ 8
- 1
debian/jitsi-meet-prosody.postinst Zobrazit soubor

@@ -150,7 +150,14 @@ case "$1" in
150 150
         # Component "focus.jitmeet.example.com" "client_proxy"
151 151
         #    target_address = "focus@auth.jitmeet.example.com"
152 152
         if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
153
-            sed -i -e "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n    target_address = \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\"/" $PROSODY_HOST_CONFIG
153
+            sed -i "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n    target_address = \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\"/g" $PROSODY_HOST_CONFIG
154
+            PROSODY_CONFIG_PRESENT="false"
155
+        fi
156
+
157
+        # Old versions of jitsi-meet-prosody come with the extra plugin path commented out (https://github.com/jitsi/jitsi-meet/commit/e11d4d3101e5228bf956a69a9e8da73d0aee7949)
158
+        # Make sure it is uncommented, as it contains required modules.
159
+        if grep -q '--plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }' ;then
160
+            sed -i 's#--plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }#plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }#g' $PROSODY_HOST_CONFIG
154 161
             PROSODY_CONFIG_PRESENT="false"
155 162
         fi
156 163
 

Načítá se…
Zrušit
Uložit