Sfoglia il codice sorgente

Ensure that upgrades don't reinstall google spyware

Bob Mottram 8 anni fa
parent
commit
ad0405d94c
1 ha cambiato i file con 15 aggiunte e 15 eliminazioni
  1. 15
    15
      src/freedombone-app-jitsi

+ 15
- 15
src/freedombone-app-jitsi Vedi File

@@ -51,6 +51,20 @@ jitsi_variables=(ONION_ONLY
51 51
                  DEFAULT_DOMAIN_NAME
52 52
                  MY_USERNAME)
53 53
 
54
+function jitsi_disable_google_spyware {
55
+    # Presumably they included Google Analytics for benign reasons, but it's
56
+    # an obvious security problem. This should disable it.
57
+    sed -i "s|Google Analytics|Google Spyware deactivated|g" /usr/share/jitsi-meet/analytics.js
58
+    sed -i "s|www.google-analytics.com|${JITSI_DOMAIN_NAME}|g" /usr/share/jitsi-meet/analytics.js
59
+    sed -i 's|ga(|//ga(|g' /usr/share/jitsi-meet/analytics.js
60
+    sed -i 's|action +|//action +|g' /usr/share/jitsi-meet/analytics.js
61
+
62
+    sed -i "s|Google Analytics|Google Spyware deactivated|g" /usr/share/jitsi-meet/libs/analytics.js
63
+    sed -i "s|www.google-analytics.com|${JITSI_DOMAIN_NAME}|g" /usr/share/jitsi-meet/libs/analytics.js
64
+    sed -i 's|ga(|//ga(|g' /usr/share/jitsi-meet/libs/analytics.js
65
+    sed -i 's|action +|//action +|g' /usr/share/jitsi-meet/libs/analytics.js
66
+}
67
+
54 68
 function change_password_jitsi {
55 69
     echo -n ''
56 70
 }
@@ -117,7 +131,7 @@ function reconfigure_jitsi {
117 131
 }
118 132
 
119 133
 function upgrade_jitsi {
120
-    echo -n ''
134
+    jitsi_disable_google_spyware
121 135
 }
122 136
 
123 137
 function backup_local_jitsi {
@@ -197,20 +211,6 @@ function remove_jitsi {
197 211
     remove_ddns_domain $JITSI_DOMAIN_NAME
198 212
 }
199 213
 
200
-function jitsi_disable_google_spyware {
201
-    # Presumably they included Google Analytics for benign reasons, but it's
202
-    # an obvious security problem. This should disable it.
203
-    sed -i "s|Google Analytics|Google Spyware deactivated|g" /usr/share/jitsi-meet/analytics.js
204
-    sed -i "s|www.google-analytics.com|${JITSI_DOMAIN_NAME}|g" /usr/share/jitsi-meet/analytics.js
205
-    sed -i 's|ga(|//ga(|g' /usr/share/jitsi-meet/analytics.js
206
-    sed -i 's|action +|//action +|g' /usr/share/jitsi-meet/analytics.js
207
-
208
-    sed -i "s|Google Analytics|Google Spyware deactivated|g" /usr/share/jitsi-meet/libs/analytics.js
209
-    sed -i "s|www.google-analytics.com|${JITSI_DOMAIN_NAME}|g" /usr/share/jitsi-meet/libs/analytics.js
210
-    sed -i 's|ga(|//ga(|g' /usr/share/jitsi-meet/libs/analytics.js
211
-    sed -i 's|action +|//action +|g' /usr/share/jitsi-meet/libs/analytics.js
212
-}
213
-
214 214
 function install_jitsi {
215 215
     if [[ "$(can_install_videobridge)" == "0" ]]; then
216 216
         echo $'jitsi meet/videobridge can only be installed on i386 or amd64 architectures'