Преглед изворни кода

Ubuntu 18.04 requires email to be set (#1871)

Debain 9, 10 and Ubuntu 20.04 allows it without
Jaap Marcus пре 4 година
родитељ
комит
4a19b6473f
1 измењених фајлова са 7 додато и 3 уклоњено
  1. 7 3
      install/hst-install-ubuntu.sh

+ 7 - 3
install/hst-install-ubuntu.sh

@@ -1210,9 +1210,13 @@ $HESTIA/bin/v-change-sys-hostname $servername 'no' > /dev/null 2>&1
 
 
 # Generating SSL certificate
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
 echo "[ * ] Generating default self-signed SSL certificate..."
-$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
-     'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
-
+if [ "$release" = "18.04" ]; then
+    $HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
+         'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
+else
+    $HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
+        'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
+fi
 # Parsing certificate file
 # Parsing certificate file
 crt_end=$(grep -n "END CERTIFICATE-" /tmp/hst.pem |cut -f 1 -d:)
 crt_end=$(grep -n "END CERTIFICATE-" /tmp/hst.pem |cut -f 1 -d:)
 key_start=$(grep -n "BEGIN RSA" /tmp/hst.pem |cut -f 1 -d:)
 key_start=$(grep -n "BEGIN RSA" /tmp/hst.pem |cut -f 1 -d:)