Merge branch 'luizluca-fix_initpki_openssl_path'

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2018-10-03 17:20:16 -05:00
commit 3d002adf65
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E

View File

@ -440,9 +440,9 @@ and initialize a fresh PKI here."
mkdir -p "$EASYRSA_PKI/$i" || die "Failed to create PKI file structure (permissions?)"
done
if [ ! -f "$EASYRSA_PKI/openssl-easyrsa.cnf" -a -f "$EASYRSA/openssl-easyrsa.cnf" ];
if [ ! -f "$EASYRSA_SSL_CONF" -a -f "$EASYRSA/openssl-easyrsa.cnf" ];
then
cp "$EASYRSA/openssl-easyrsa.cnf" "$EASYRSA_PKI/openssl-easyrsa.cnf"
cp "$EASYRSA/openssl-easyrsa.cnf" "$EASYRSA_SSL_CONF"
fi
notice "\