Bläddra i källkod

handles spaces around hostname

((users doubleclick a host name and paste result in the installer)
master
gpatel-fr 4 år sedan
förälder
incheckning
29bbcf8590

+ 2
- 2
debian/jitsi-meet-prosody.postinst Visa fil

35
             db_input critical jitsi-videobridge/jvb-hostname || true
35
             db_input critical jitsi-videobridge/jvb-hostname || true
36
             db_go
36
             db_go
37
         fi
37
         fi
38
-        JVB_HOSTNAME="$RET"
38
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
39
 
39
 
40
         db_get jitsi-videobridge/jvbsecret
40
         db_get jitsi-videobridge/jvbsecret
41
         if [ -z "$RET" ] ; then
41
         if [ -z "$RET" ] ; then
64
 
64
 
65
         # detect dpkg-reconfigure, just delete old links
65
         # detect dpkg-reconfigure, just delete old links
66
         db_get jitsi-meet-prosody/jvb-hostname
66
         db_get jitsi-meet-prosody/jvb-hostname
67
-        JVB_HOSTNAME_OLD=$RET
67
+        JVB_HOSTNAME_OLD=$(echo "$RET" | xargs echo -n)
68
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
68
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
69
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME_OLD.cfg.lua
69
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME_OLD.cfg.lua
70
             rm -f /etc/prosody/certs/$JVB_HOSTNAME_OLD.key
70
             rm -f /etc/prosody/certs/$JVB_HOSTNAME_OLD.key

+ 1
- 1
debian/jitsi-meet-prosody.postrm Visa fil

31
 
31
 
32
     purge)
32
     purge)
33
         db_get jitsi-meet-prosody/jvb-hostname
33
         db_get jitsi-meet-prosody/jvb-hostname
34
-        JVB_HOSTNAME=$RET
34
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
35
         if [ -n "$RET" ]; then
35
         if [ -n "$RET" ]; then
36
             rm -f /etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua
36
             rm -f /etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua
37
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
37
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua

+ 1
- 1
debian/jitsi-meet-tokens.postinst Visa fil

25
         . /usr/share/debconf/confmodule
25
         . /usr/share/debconf/confmodule
26
 
26
 
27
         db_get jitsi-meet-prosody/jvb-hostname
27
         db_get jitsi-meet-prosody/jvb-hostname
28
-        JVB_HOSTNAME="$RET"
28
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
29
 
29
 
30
         db_get jitsi-meet-tokens/appid
30
         db_get jitsi-meet-tokens/appid
31
         if [ "$RET" = "false" ] ; then
31
         if [ "$RET" = "false" ] ; then

+ 2
- 2
debian/jitsi-meet-turnserver.postinst Visa fil

30
             db_input critical jitsi-videobridge/jvb-hostname || true
30
             db_input critical jitsi-videobridge/jvb-hostname || true
31
             db_go
31
             db_go
32
         fi
32
         fi
33
-        JVB_HOSTNAME="$RET"
33
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
34
 
34
 
35
         TURN_CONFIG="/etc/turnserver.conf"
35
         TURN_CONFIG="/etc/turnserver.conf"
36
         NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
36
         NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
44
 
44
 
45
         # detect dpkg-reconfigure, just delete old links
45
         # detect dpkg-reconfigure, just delete old links
46
         db_get jitsi-meet-turnserver/jvb-hostname
46
         db_get jitsi-meet-turnserver/jvb-hostname
47
-        JVB_HOSTNAME_OLD=$RET
47
+        JVB_HOSTNAME_OLD=$(echo "$RET" | xargs echo -n)
48
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
48
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
49
             if [[ -f $TURN_CONFIG ]] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
49
             if [[ -f $TURN_CONFIG ]] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
50
                 rm -f $TURN_CONFIG
50
                 rm -f $TURN_CONFIG

+ 2
- 2
debian/jitsi-meet-web-config.postinst Visa fil

32
             db_go
32
             db_go
33
             db_get jitsi-videobridge/jvb-hostname
33
             db_get jitsi-videobridge/jvb-hostname
34
         fi
34
         fi
35
-        JVB_HOSTNAME="$RET"
35
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
36
 
36
 
37
         # detect dpkg-reconfigure
37
         # detect dpkg-reconfigure
38
         RECONFIGURING="false"
38
         RECONFIGURING="false"
39
         db_get jitsi-meet/jvb-hostname
39
         db_get jitsi-meet/jvb-hostname
40
-        JVB_HOSTNAME_OLD=$RET
40
+        JVB_HOSTNAME_OLD=$(echo "$RET" | xargs echo -n)
41
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
41
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
42
             RECONFIGURING="true"
42
             RECONFIGURING="true"
43
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME_OLD-config.js
43
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME_OLD-config.js

+ 1
- 1
debian/jitsi-meet-web-config.postrm Visa fil

33
     ;;
33
     ;;
34
     purge)
34
     purge)
35
         db_get jitsi-meet/jvb-hostname
35
         db_get jitsi-meet/jvb-hostname
36
-        JVB_HOSTNAME=$RET
36
+        JVB_HOSTNAME=$(echo "$RET" | xargs echo -n)
37
         if [ -n "$RET" ]; then
37
         if [ -n "$RET" ]; then
38
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME-config.js
38
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME-config.js
39
             rm -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf
39
             rm -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf

Laddar…
Avbryt
Spara