Pārlūkot izejas kodu

Fixes SSL debconf questions.

master
turint 10 gadus atpakaļ
vecāks
revīzija
c5edb4b5a3
2 mainītis faili ar 8 papildinājumiem un 12 dzēšanām
  1. 0
    8
      debian/jitsi-meet.config
  2. 8
    4
      debian/jitsi-meet.postinst

+ 0
- 8
debian/jitsi-meet.config Parādīt failu

6
 # certificate type choice
6
 # certificate type choice
7
 db_input critical jitsi-meet/cert-choice || true
7
 db_input critical jitsi-meet/cert-choice || true
8
 db_go
8
 db_go
9
-
10
-# ssl key file path
11
-#db_input critical jitsi-meet/cert-path-key || true
12
-#db_go
13
-
14
-# ssl cert file path
15
-#db_input critical jitsi-meet/cert-path-crt || true
16
-#db_go

+ 8
- 4
debian/jitsi-meet.postinst Parādīt failu

44
             # self-signed certificate is already in place for prosody
44
             # self-signed certificate is already in place for prosody
45
             :
45
             :
46
         elif [ "$CERT_CHOICE" = 'I have a certificate and will upload the files on the server' ]; then
46
         elif [ "$CERT_CHOICE" = 'I have a certificate and will upload the files on the server' ]; then
47
-            db_fset jitsi-meet/default-key "/etc/ssl/$JVB_HOSTNAME.key"
47
+            db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
48
             db_input critical jitsi-meet/cert-path-key || true
48
             db_input critical jitsi-meet/cert-path-key || true
49
             db_go
49
             db_go
50
             db_get jitsi-meet/cert-path-key
50
             db_get jitsi-meet/cert-path-key
51
             CERT_KEY="$RET"
51
             CERT_KEY="$RET"
52
-            db_fset jitsi-meet/default-crt "/etc/ssl/$JVB_HOSTNAME.crt"
52
+            db_set jitsi-meet/cert-path-crt "/etc/ssl/$JVB_HOSTNAME.crt"
53
             db_input critical jitsi-meet/cert-path-crt || true
53
             db_input critical jitsi-meet/cert-path-crt || true
54
             db_go
54
             db_go
55
             db_get jitsi-meet/cert-path-crt
55
             db_get jitsi-meet/cert-path-crt
56
             CERT_CRT="$RET"
56
             CERT_CRT="$RET"
57
             # replace self-signed certificate paths with user provided ones
57
             # replace self-signed certificate paths with user provided ones
58
-            sed -i "s/ssl_certificate_key\ \/var\/lib\/prosody\/(.*)key/ssl_certificate_key\ $CERT_KEY/g" \
58
+            CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g')
59
+            CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g')
60
+            sed -i "s/ssl_certificate_key\ \/var\/lib\/prosody\/.*key/ssl_certificate_key\ $CERT_KEY_ESC/g" \
59
                 /etc/nginx/sites-available/$JVB_HOSTNAME.conf
61
                 /etc/nginx/sites-available/$JVB_HOSTNAME.conf
60
-            sed -i "s/ssl_certificate\ \/var\/lib\/prosody\/(.*)crt/ssl_certificate\ $CERT_CRT/g" \
62
+            CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g')
63
+            CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g')
64
+            sed -i "s/ssl_certificate\ \/var\/lib\/prosody\/.*crt/ssl_certificate\ $CERT_CRT_ESC/g" \
61
                 /etc/nginx/sites-available/$JVB_HOSTNAME.conf
65
                 /etc/nginx/sites-available/$JVB_HOSTNAME.conf
62
         fi
66
         fi
63
 
67
 

Notiek ielāde…
Atcelt
Saglabāt