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

build_key-pass.sh: some minor changes.

Browse Source
This commit is contained in:
Christoph 2019-07-16 00:06:35 +02:00
parent ba6d753101
commit d325eb2a24
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build_key-pass.sh
View File

@ -281,17 +281,17 @@ fi
if $EASYRSA_LAYOUT_NEW ; then if $EASYRSA_LAYOUT_NEW ; then
_CLIENT_CERT="${OPENVPN_KEY_DIR}/issued/${KEY_CN}-${NEW_KEY_NAME}.crt" _CLIENT_CERT="${OPENVPN_KEY_DIR}/issued/${KEY_CN}-${NEW_KEY_NAME}.crt"
_CLIENT__KEY="${OPENVPN_KEY_DIR}/private/${KEY_CN}-${NEW_KEY_NAME}.key" _CLIENT_KEY="${OPENVPN_KEY_DIR}/private/${KEY_CN}-${NEW_KEY_NAME}.key"
else else
_CLIENT_CERT="${OPENVPN_KEY_DIR}/${NEW_KEY_NAME}.crt" _CLIENT_CERT="${OPENVPN_KEY_DIR}/${NEW_KEY_NAME}.crt"
_CLIENT__KEY="${OPENVPN_KEY_DIR}/${NEW_KEY_NAME}.key" _CLIENT_KEY="${OPENVPN_KEY_DIR}/${NEW_KEY_NAME}.key"
fi fi
for _name in $key_names_reserverd ; do for _name in $key_names_reserverd ; do
[[ "$_name" = "$NEW_KEY_NAME" ]] && fatal "Name '$NEW_KEY_NAME' cannot be used - its a reserved name!" [[ "$_name" = "$NEW_KEY_NAME" ]] && fatal "Name '$NEW_KEY_NAME' cannot be used - its a reserved name!"
done done
if [[ -f "${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.key" ]]; then if [[ -f "${_CLIENT_KEY}" ]]; then
fatal "Name '$NEW_KEY_NAME' is already in use" fatal "Name '$NEW_KEY_NAME' is already in use"
fi fi
@ -331,11 +331,11 @@ echo ""
echo "OpenVPN Base directory..: $OPENVPN_BASE_DIR" echo "OpenVPN Base directory..: $OPENVPN_BASE_DIR"
echo "" echo ""
echo "" echo ""
echo "Client Key..............: $(basename "$_CLIENT__KEY")" echo "Client Key..............: $(basename "$_CLIENT_KEY")"
echo "Client Cert.............: $(basename "$_CLIENT_CERT")" echo "Client Cert.............: $(basename "$_CLIENT_CERT")"
echo "Key Password............: $KEY_PW" echo "Key Password............: $KEY_PW"
info "Going to create \033[37m\033[1m$(basename "$_CLIENT__KEY")/$(basename "$_CLIENT_CERT")\033[m.." info "Going to create \033[37m\033[1m$(basename "$_CLIENT_KEY")/$(basename "$_CLIENT_CERT")\033[m.."
echo -n "To continue type uppercase 'YES': " echo -n "To continue type uppercase 'YES': "
read OK read OK
echo "" echo ""
@ -413,8 +413,8 @@ echo ""
echononl " Add new key credentials to file ${OPENVPN_BASE_DIR}/keys-created.txt" echononl " Add new key credentials to file ${OPENVPN_BASE_DIR}/keys-created.txt"
cat << EOF >> ${OPENVPN_BASE_DIR}/keys-created.txt cat << EOF >> ${OPENVPN_BASE_DIR}/keys-created.txt
key...............: $(basename "$_CLIENT__KEY") key...............: $(basename "$_CLIENT_KEY")
common name.......: $(basename "${_CLIENT__KEY%.*}") common name.......: $(basename "${_CLIENT_KEY%.*}")
password..........: ${KEY_PW} password..........: ${KEY_PW}
EOF EOF
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then
@ -540,7 +540,7 @@ cat << EOF >> "$_client_conf_file" 2> $log_file
<key> <key>
EOF EOF
_file="${_CLIENT__KEY}" _file="${_CLIENT_KEY}"
_found=false _found=false
while IFS='' read -r line || [[ -n $line ]]; do while IFS='' read -r line || [[ -n $line ]]; do
if [[ "$line" =~ "-----BEGIN" ]] ; then if [[ "$line" =~ "-----BEGIN" ]] ; then
@ -732,7 +732,7 @@ if $_copy_to_user_home_dir ; then
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cp -a "${_CLIENT__KEY}" "${_target_dir}/" >> $log_file 2>&1 cp -a "${_CLIENT_KEY}" "${_target_dir}" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
@ -752,7 +752,7 @@ if $_copy_to_user_home_dir ; then
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cp -a "${_CLIENT_CERT}" "${_target_dir}/" >> $log_file 2>&1 cp -a "${_CLIENT_CERT}" "${_target_dir}" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
@ -765,8 +765,8 @@ if $_copy_to_user_home_dir ; then
_failed=true _failed=true
fi fi
cat << EOF > "${_target_dir}/passwd.txt" cat << EOF > "${_target_dir}/passwd.txt"
key...............: $(basename "$_CLIENT__KEY") key...............: $(basename "$_CLIENT_KEY")
common name.......: $(basename "${_CLIENT__KEY%.*}") common name.......: $(basename "${_CLIENT_KEY%.*}")
password..........: ${KEY_PW} password..........: ${KEY_PW}
EOF EOF
@ -809,10 +809,10 @@ EOF
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cd "${_target_dir}"
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true
fi fi
cd "${_target_dir}"
chown -R ${user_name}:$user_name "$target_macos_tblk_dir" >> $log_file 2>&1 chown -R ${user_name}:$user_name "$target_macos_tblk_dir" >> $log_file 2>&1
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
_failed=true _failed=true