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

create_key_config.sh,build_key-pass.sh: some minor changes on naming 'ta.key' and 'ca.cert'.

Browse Source
This commit is contained in:
Christoph 2022-08-17 16:24:06 +02:00
parent 7ac86350aa
commit 3b8b237c32
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build_key-pass.sh
View File

@ -800,13 +800,24 @@ if $_copy_to_user_home_dir ; then
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cp -a "${_CA_CERT}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_CA_CERT})" >> $log_file 2>&1 if [[ -n "$ORG_SHORTCUT" ]]; then
if [[ $? -ne 0 ]] ; then cp -a "${_CA_CERT}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_CA_CERT})" >> $log_file 2>&1
_failed=true if [[ $? -ne 0 ]] ; then
fi _failed=true
cp -a "${_TA_KEY}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_TA_KEY})" >> $log_file 2>&1 fi
if [[ $? -ne 0 ]] ; then cp -a "${_TA_KEY}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_TA_KEY})" >> $log_file 2>&1
_failed=true if [[ $? -ne 0 ]] ; then
_failed=true
fi
else
cp -a "${_CA_CERT}" "${_target_dir}/VPN-${KEY_CN/VPN-/}-$(basename ${_CA_CERT})" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then
_failed=true
fi
cp -a "${_TA_KEY}" "${_target_dir}/VPN-${KEY_CN/VPN-KEY_CN/VPN-/basename ${_TA_KEY})" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then
_failed=true
fi
fi fi
cat << EOF > "${_target_dir}/passwd.txt" cat << EOF > "${_target_dir}/passwd.txt"
key...............: $(basename "$_CLIENT_KEY") key...............: $(basename "$_CLIENT_KEY")

25
create_key_config.sh
View File

@ -695,13 +695,24 @@ cp -a "${_CLIENT_CERT}" "${_target_dir}/" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cp -a "${_CA_CERT}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_CA_CERT})" >> $log_file 2>&1 if [[ -n "$ORG_SHORTCUT" ]]; then
if [[ $? -ne 0 ]] ; then cp -a "${_CA_CERT}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_CA_CERT})" >> $log_file 2>&1
_failed=true if [[ $? -ne 0 ]] ; then
fi _failed=true
cp -a "${_TA_KEY}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_TA_KEY})" >> $log_file 2>&1 fi
if [[ $? -ne 0 ]] ; then cp -a "${_TA_KEY}" "${_target_dir}/VPN-${ORG_SHORTCUT}-$(basename ${_TA_KEY})" >> $log_file 2>&1
_failed=true if [[ $? -ne 0 ]] ; then
_failed=true
fi
else
cp -a "${_CA_CERT}" "${_target_dir}/VPN-${KEY_CN/VPN-/}-$(basename ${_CA_CERT})" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then
_failed=true
fi
cp -a "${_TA_KEY}" "${_target_dir}/VPN-${KEY_CN/VPN-/}-$(basename ${_TA_KEY})" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then
_failed=true
fi
fi fi
cat << EOF > "${_target_dir}/passwd.txt" cat << EOF > "${_target_dir}/passwd.txt"
key...............: $(basename "$_CLIENT_KEY") key...............: $(basename "$_CLIENT_KEY")