From fd4a5dc38ebe850b1efb7d4d7280cd394b4bfd19 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Fri, 13 Mar 2015 00:43:50 +0100 Subject: [PATCH] EASYRSA_PKI might not be defined. --- bin/ovpn_getclient | 11 +++++++++-- bin/ovpn_getclient_all | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/ovpn_getclient b/bin/ovpn_getclient index ca83f8c..06a041e 100755 --- a/bin/ovpn_getclient +++ b/bin/ovpn_getclient @@ -11,9 +11,16 @@ fi set -e if [ -z "$OPENVPN" ]; then - OPENVPN="$PWD" + export OPENVPN="$PWD" fi -source "$OPENVPN/ovpn_env.sh" +if ! source "$OPENVPN/ovpn_env.sh"; then + echo "Could not source $OPENVPN/ovpn_env.sh." + exit 1 +fi +if [ -z "$EASYRSA_PKI" ]; then + export EASYRSA_PKI="$OPENVPN/pki" +fi + cn="$1" parm="$2" diff --git a/bin/ovpn_getclient_all b/bin/ovpn_getclient_all index d6ebb58..f94980a 100755 --- a/bin/ovpn_getclient_all +++ b/bin/ovpn_getclient_all @@ -9,6 +9,9 @@ if ! source "$OPENVPN/ovpn_env.sh"; then echo "Could not source $OPENVPN/ovpn_env.sh." exit 1 fi +if [ -z "$EASYRSA_PKI" ]; then + export EASYRSA_PKI="$OPENVPN/pki" +fi pushd "$EASYRSA_PKI" for name in issued/*.crt; do