1
0
sahsanu 9 сар өмнө
parent
commit
bee85e6526

+ 6 - 6
bin/v-generate-ssl-cert

@@ -113,6 +113,12 @@ fi
 subj="$subj/C=$country/ST=$state/L=$city/O=$org"
 subj="$subj/C=$country/ST=$state/L=$city/O=$org"
 subj="$subj/OU=$org_unit/CN=$domain_idn"
 subj="$subj/OU=$org_unit/CN=$domain_idn"
 
 
+if [ -e "/etc/ssl/openssl.cnf" ]; then
+	ssl_conf='/etc/ssl/openssl.cnf'
+else
+	ssl_conf="/etc/pki/tls/openssl.cnf"
+fi
+
 if [ -z "$aliases" ]; then
 if [ -z "$aliases" ]; then
 	openssl req -sha256 -new \
 	openssl req -sha256 -new \
 		-batch \
 		-batch \
@@ -130,12 +136,6 @@ else
 		dns_aliases="${dns_aliases}DNS:$alias,"
 		dns_aliases="${dns_aliases}DNS:$alias,"
 	done
 	done
 	dns_aliases=$(echo $dns_aliases | sed "s/,$//")
 	dns_aliases=$(echo $dns_aliases | sed "s/,$//")
-	if [ -e "/etc/ssl/openssl.cnf" ]; then
-		ssl_conf='/etc/ssl/openssl.cnf'
-	else
-		ssl_conf="/etc/pki/tls/openssl.cnf"
-	fi
-
 	openssl req -sha256 -new \
 	openssl req -sha256 -new \
 		-batch \
 		-batch \
 		-subj "$subj" \
 		-subj "$subj" \