diff --git a/install_openvpn.sh b/install_openvpn.sh index a95dd84..5e1f23d 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -1103,9 +1103,9 @@ else fi if [[ ! -f "$KEY_CONFIG" ]] ; then - if [[ -f "$(basename $KEY_CONFIG)/openssl-1.0.0.cnf" ]]; then - echononl " Create Symlink '$(basename $KEY_CONFIG)'.." - ln -s "$(basename $KEY_CONFIG)/openssl-1.0.0.cnf" "$KEY_CONFIG" + echononl " Create Symlink '$(basename $KEY_CONFIG)'.." + if [[ -f "$(dirname $KEY_CONFIG)/openssl-1.0.0.cnf" ]]; then + ln -s "$(dirname $KEY_CONFIG)/openssl-1.0.0.cnf" "$KEY_CONFIG" if [[ $? -eq 0 ]] ; then echo_ok else @@ -1113,17 +1113,19 @@ if [[ ! -f "$KEY_CONFIG" ]] ; then error "$(cat $log_file)" fatal "No OpenSSL configuration file present!" fi + else + fatal "No OpenSSL configuration file present!" fi fi _failed=false -echononl " Adjust '$KEY_CONFIG'.." OPENSSL_CONFIG_FILE="$(realpath "$KEY_CONFIG")" -perl -i.ORIG -n -p -e "s/^(\s*default_days\s*=.*)/#\1\ndefault_days = $CA_EXPIRE/" $KEY_CONFIG > "$log_file" 2>&1 +echononl " Adjust '$OPENSSL_CONFIG_FILE'.." +perl -i.ORIG -n -p -e "s/^(\s*default_days\s*=.*)/#\1\ndefault_days = $CA_EXPIRE/" $OPENSSL_CONFIG_FILE > "$log_file" 2>&1 if [[ $? -ne 0 ]]; then _failed=true fi -perl -i -n -p -e "s/^(\s*default_crl_days\s*=.*)/#\1\ndefault_crl_days = $CA_EXPIRE/" $KEY_CONFIG > "$log_file" 2>&1 +perl -i -n -p -e "s/^(\s*default_crl_days\s*=.*)/#\1\ndefault_crl_days = $CA_EXPIRE/" $OPENSSL_CONFIG_FILE > "$log_file" 2>&1 if [[ $? -ne 0 ]]; then _failed=true fi @@ -1136,6 +1138,7 @@ else fi + # --- # - Create Keys and Certs # ---