Merge branch 'main' into feature/user-roles

Author: Kristan Kenney

bin/v-generate-ssl-cert

@@ -93,8 +93,13 @@ cd $workdir
 # Generate private key
 openssl genrsa $KEY_SIZE > $domain.key 2>/dev/null
 
+subj=""
 # Generate the CSR
-subj="/emailAddress=$email/C=$country/ST=$state/L=$city/O=$org"
+if [ -z "$email" ]; then 
+    subj="/emailAddress=$email"
+fi
+
+subj="$subj/C=$country/ST=$state/L=$city/O=$org"
 subj="$subj/OU=$org_unit/CN=$domain_idn"
 
 if [ -z "$aliases" ]; then

install/hst-install-debian.sh

@@ -1181,7 +1181,7 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
-$HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
+$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
      'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
 
 # Parsing certificate file

install/hst-install-ubuntu.sh

@@ -1210,7 +1210,7 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
-$HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
+$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
      'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
 
 # Parsing certificate file

web/generate/ssl/index.php

@@ -11,7 +11,7 @@
 } else {
     $v_domain = 'example.ltd';
 }
-$v_email = 'admin@' . $v_domain;
+$v_email = '';
 $v_country = 'US';
 $v_state = 'California';
 $v_locality = 'San Francisco';
@@ -39,7 +39,6 @@
 if (empty($_POST['v_state'])) $errors[] = _('State');
 if (empty($_POST['v_locality'])) $errors[] = _('City');
 if (empty($_POST['v_org'])) $errors[] = _('Organization');
-if (empty($_POST['v_email'])) $errors[] = _('Email');
 $v_domain = $_POST['v_domain'];
 $v_aliases = $_POST['v_aliases'];
 $v_email = $_POST['v_email'];