diff --git a/scripts/openvpn/listOVPN.sh b/scripts/openvpn/listOVPN.sh index ec0ffd7..cb3130f 100755 --- a/scripts/openvpn/listOVPN.sh +++ b/scripts/openvpn/listOVPN.sh @@ -1,27 +1,31 @@ #!/usr/bin/env bash # PiVPN: list clients script +# Updated Script to include Expiration Dates and Clean up Escape Seq -- psgoundar INDEX="/etc/openvpn/easy-rsa/pki/index.txt" -printf "\n" +printf "\\n" if [ ! -f "${INDEX}" ]; then echo "The file: $INDEX was not found!" exit 1 fi printf ": NOTE : The first entry should always be your valid server!\n" -printf "\n" -printf "\e[1m::: Certificate Status List :::\e[0m\n" -printf " ::\e[4m Status \e[0m||\e[4m Name \e[0m:: \n" +printf "\\n" +printf "\\e[1m::: Certificate Status List :::\\e[0m\\n" +printf "\\e[4mStatus\\e[0m :: \\e[4mName\\e[0m\\e[0m :: \\e[4mExpiration \\e[0m\\n" while read -r line || [ -n "$line" ]; do STATUS=$(echo "$line" | awk '{print $1}') - NAME=$(echo "$line" | sed -e 's:.*/CN=::') + NAME=$(echo "$line" | awk '{print $5}' | awk -F= '{print $2}') + EXPD=$(echo "$line" | awk '{if (length($2) == 15) print $2; else print "20"$2}' | cut -b 1-8 | date +"%b %d %Y" -f -) + if [ "${STATUS}" == "V" ]; then - printf " Valid :: %s\n" "$NAME" + printf " Valid :: %s :: %s\\n" "$NAME" "$EXPD" elif [ "${STATUS}" == "R" ]; then - printf " Revoked :: %s\n" "$NAME" + printf " Revoked :: %s :: %s\\n" "$NAME" "$EXPD" else - printf " Unknown :: %s\n" "$NAME" + printf " Unknown :: %s :: %s\\n" "$NAME" "$EXPD" fi -done <${INDEX} -printf "\n" + +done <${INDEX} | column -t +printf "\\n" \ No newline at end of file