install/openvpn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error in creating symlink 'openssl.cnf'. Fix error in adjusting 'openssl.cnf.

Browse Source
This commit is contained in:
Christoph 2017-08-09 15:39:15 +02:00
parent 3e477bd162
commit c5a38e6b1d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install_openvpn.sh
View File

@ -1103,9 +1103,9 @@ else
fi fi
if [[ ! -f "$KEY_CONFIG" ]] ; then if [[ ! -f "$KEY_CONFIG" ]] ; then
if [[ -f "$(basename $KEY_CONFIG)/openssl-1.0.0.cnf" ]]; then
echononl " Create Symlink '$(basename $KEY_CONFIG)'.." echononl " Create Symlink '$(basename $KEY_CONFIG)'.."
ln -s "$(basename $KEY_CONFIG)/openssl-1.0.0.cnf" "$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 if [[ $? -eq 0 ]] ; then
echo_ok echo_ok
else else
@ -1113,17 +1113,19 @@ if [[ ! -f "$KEY_CONFIG" ]] ; then
error "$(cat $log_file)" error "$(cat $log_file)"
fatal "No OpenSSL configuration file present!" fatal "No OpenSSL configuration file present!"
fi fi
else
fatal "No OpenSSL configuration file present!"
fi fi
fi fi
_failed=false _failed=false
echononl " Adjust '$KEY_CONFIG'.."
OPENSSL_CONFIG_FILE="$(realpath "$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 if [[ $? -ne 0 ]]; then
_failed=true _failed=true
fi 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 if [[ $? -ne 0 ]]; then
_failed=true _failed=true
fi fi
@ -1136,6 +1138,7 @@ else
fi fi
# --- # ---
# - Create Keys and Certs # - Create Keys and Certs
# --- # ---