Browse Source

handles spaces around hostname

((users doubleclick a host name and paste result in the installer)
master
gpatel-fr 4 years ago
parent
commit
29bbcf8590

+ 2
- 2
debian/jitsi-meet-prosody.postinst View File

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

+ 1
- 1
debian/jitsi-meet-prosody.postrm View File

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

+ 1
- 1
debian/jitsi-meet-tokens.postinst View File

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

+ 2
- 2
debian/jitsi-meet-turnserver.postinst View File

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

+ 2
- 2
debian/jitsi-meet-web-config.postinst View File

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

+ 1
- 1
debian/jitsi-meet-web-config.postrm View File

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

Loading…
Cancel
Save