Add variable 'ORG_SHORTCUT'. Change name of service output-files.

build_key-pass.sh

@@ -640,7 +640,16 @@ if $_copy_to_user_home_dir ; then
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi
-   cp -a "$_client_conf_file" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-$(basename $_client_conf_file)"
+
+   if [[ -n "$ORG_SHORTCUT" ]]; then
+      cp -a "$_client_conf_file" \
+         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-${ORG_SHORTCUT}-$(basename $_client_conf_file)" \
+          >> $log_file 2>&1
+   else
+      cp -a "$_client_conf_file" \
+         "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-${KEY_CN/VPN-/}-$(basename $_client_conf_file)" \
+         >> $log_file 2>&1
+   fi
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi
@@ -668,6 +677,10 @@ if $_copy_to_user_home_dir ; then
    common name.......: ${KEY_CN}-${NEW_KEY_NAME}
    password..........: ${KEY_PW}
 EOF
+   echo "${KEY_PW}" > "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/ovpn_pass"
+   if [[ $? -ne 0 ]] ; then
+      _failed=true
+   fi
    if [[ $? -ne 0 ]] ; then
       _failed=true
    fi