From 3e477bd16287d37edf3ede2a8e27a9894f28db50 Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 9 Aug 2017 12:43:44 +0200 Subject: [PATCH] - Fix error on missing OpenSSL configuration file. - Set default_crl_days to the same value as default_days. --- install_openvpn.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/install_openvpn.sh b/install_openvpn.sh index af9eaee..a95dd84 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -1102,6 +1102,39 @@ else error "$(cat $log_file)" 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" + if [[ $? -eq 0 ]] ; then + echo_ok + else + echo_failed + error "$(cat $log_file)" + fatal "No OpenSSL configuration file present!" + fi + 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 +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 +if [[ $? -ne 0 ]]; then + _failed=true +fi + +if $_failed ; then + echo_failed + error "$(cat $log_file)" +else + echo_ok +fi + # --- # - Create Keys and Certs