Fabio/openvpn-install
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up Formating

Browse source
This commit is contained in:
Swamy Goundar 2020-03-28 19:20:57 -07:00
parent f6dd08dc6e
commit cfc63eb27b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
openvpn-install.sh
View file

@ -1258,7 +1258,6 @@ function removeOpenVPN () {
}
function listcerts () {
# Original Script from PiVPN: list clients script
<<<<<<< HEAD
# Modified Script to add Certificate expiration Date -- Swamy Goundar 03/28/2020
@ -1266,7 +1265,6 @@ function listcerts () {
# Modified Script to add Certificate expiration Date -- psgoundar
>>>>>>> 4dce304... Added List function to Show Issued Certificates
INDEX="/etc/openvpn/easy-rsa/pki/index.txt"
printf "\\n"
if [ ! -f "${INDEX}" ]; then
@ -1274,6 +1272,7 @@ if [ ! -f "${INDEX}" ]; then
exit 1
fi
<<<<<<< HEAD
#printf ": NOTE : The first entry should always be your valid server!\n"
#printf "\n"
<<<<<<< HEAD
@ -1285,6 +1284,8 @@ printf "\\e[4mStatus\\e[0m \t \\e[4mName\\e[0m\\e[0m \t \\e[4mExpiration\\e[
printf "\e[4mStatus\e[0m :: \e[4mName\e[0m\e[0m :: \e[4mExpiration \e[0m\n"
>>>>>>> 4dce304... Added List function to Show Issued Certificates
=======
=======
>>>>>>> dd5f3e1... Cleaned up Formating
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"
>>>>>>> 163f729... Updated Syntax Formating
@ -1296,6 +1297,7 @@ while read -r line || [ -n "$line" ]; do
if [ "${STATUS}" == "V" ]; then
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
printf "Valid \t %s \t %s\\n" "$NAME" "$EXPD"
elif [ "${STATUS}" == "R" ]; then
@ -1450,12 +1452,15 @@ Last_Backup_Ovpn_Archive_File=$(ls -t $Backup_Location/ovpn* | head -n 1)
printf " Valid :: %s :: %s\\n" "$NAME" "$EXPD"
>>>>>>> 163f729... Updated Syntax Formating
=======
printf " Valid :: %s :: %s\\n" "$NAME" "$EXPD"
>>>>>>> dd5f3e1... Cleaned up Formating
elif [ "${STATUS}" == "R" ]; then
printf " Revoked :: %s :: %s\\n" "$NAME" "$EXPD"
else
printf " Unknown :: %s :: %s\\n" "$NAME" "$EXPD"
fi
done <${INDEX} | column -t
<<<<<<< HEAD
printf "\n"