Bob Mottram il y a 8 ans
Parent
révision
7421073c2b
1 fichiers modifiés avec 1 ajouts et 34 suppressions
  1. 1
    34
      src/freedombone-app-jitsi

+ 1
- 34
src/freedombone-app-jitsi Voir le fichier

@@ -37,24 +37,18 @@ SHOW_ON_ABOUT=1
37 37
 
38 38
 VIDEOBRIDGE_PORT=5347
39 39
 JITSI_ONION_PORT=8102
40
-JITSI_VIDEOBRIDGE_ONION_PORT=8103
41
-JITSI_AUTH_ONION_PORT=8104
42
-JITSI_FOCUS_ONION_PORT=8105
43 40
 JITSI_PORT=5280
44 41
 
45 42
 # domains
46 43
 JITSI_DOMAIN_NAME=
47 44
 JITSI_CODE=
48 45
 JITSI_ONION_HOSTNAME=
49
-JITSI_AUTH_ONION_HOSTNAME=
50 46
 
51 47
 jitsi_variables=(ONION_ONLY
52 48
                  JITSI_DOMAIN_NAME
49
+                 JITSI_ONION_HOSTNAME
53 50
                  JITSI_CODE
54
-                 JITSI_MEET_REPO
55
-                 JITSI_MEET_COMMIT
56 51
                  DEFAULT_DOMAIN_NAME
57
-                 JITSI_ONION_HOSTNAME
58 52
                  MY_USERNAME)
59 53
 
60 54
 function change_password_jitsi {
@@ -70,26 +64,6 @@ function can_install_videobridge {
70 64
     fi
71 65
 }
72 66
 
73
-function add_jitsi_onion_domain {
74
-    jitsi_subdomain_name="$1"
75
-    jitsi_subdomain_port="$2"
76
-    jitsi_subdomain_onion_port="$3"
77
-
78
-    new_domain=$(add_onion_service "${jitsi_subdomain_name}" ${jitsi_subdomain_port} ${jitsi_subdomain_onion_port})
79
-
80
-    if ! grep -q "Jitsi ${jitsi_subdomain_name} onion domain" /home/${MY_USERNAME}/README; then
81
-        echo $"Jitsi ${jitsi_subdomain_name} onion domain: ${new_domain}" >> /home/${MY_USERNAME}/README
82
-        echo '' >> /home/${MY_USERNAME}/README
83
-        chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/README
84
-        chmod 600 /home/${MY_USERNAME}/README
85
-    else
86
-        if [ -f /home/${MY_USERNAME}/README ]; then
87
-            sed -i "s|Jitsi ${jitsi_subdomain_name} onion domain.*|Jitsi ${jitsi_subdomain_name} onion domain: ${new_domain}|g" /home/${MY_USERNAME}/README
88
-        fi
89
-    fi
90
-    echo "${new_domain}"
91
-}
92
-
93 67
 function create_jitsi_subdomains {
94 68
     JITSI_ONION_HOSTNAME=$(add_onion_service jitsi 80 ${JITSI_ONION_PORT})
95 69
 
@@ -103,18 +77,11 @@ function create_jitsi_subdomains {
103 77
             sed -i "s|Jitsi onion domain.*|Jitsi onion domain: ${JITSI_ONION_HOSTNAME}|g" /home/${MY_USERNAME}/README
104 78
         fi
105 79
     fi
106
-
107
-    #JITSI_VIDEOBRIDGE_ONION_HOSTNAME=$(add_jitsi_onion_domain jitsi-videobridge ${VIDEOBRIDGE_PORT} ${JITSI_VIDEOBRIDGE_ONION_PORT})
108
-    #JITSI_AUTH_ONION_HOSTNAME=$(add_jitsi_onion_domain jitsi-auth 5222 ${JITSI_AUTH_ONION_PORT})
109
-    #JITSI_FOCUS_ONION_HOSTNAME=$(add_jitsi_onion_domain jitsi-focus 5222 ${JITSI_FOCUS_ONION_PORT})
110 80
 }
111 81
 
112 82
 function remove_jitsi_subdomains {
113 83
     function_check remove_onion_service
114 84
     remove_onion_service jitsi ${JITSI_ONION_PORT}
115
-    #remove_onion_service jitsi-videobridge ${JITSI_VIDEOBRIDGE_ONION_PORT}
116
-    #remove_onion_service jitsi-auth ${JITSI_AUTH_ONION_PORT}
117
-    #remove_onion_service jitsi-focus ${JITSI_FOCUS_ONION_PORT}
118 85
 }
119 86
 
120 87
 function remove_user_jitsi {