Fix new additions

This commit is contained in:
Kaladin Light 2016-12-24 16:17:16 -05:00
parent 371f339fed
commit d1ad3ec057
2 changed files with 6 additions and 4 deletions

2
pivpn
View file

@ -27,7 +27,7 @@ function listOVPNFunc {
} }
function debugFunc { function debugFunc {
noUFW=$(cat /etc/pivpn/noUFW) noUFW=$(cat /etc/pivpn/NO_UFW)
echo "::: Generating Debug Output" echo "::: Generating Debug Output"
$SUDO . /opt/pivpn/pivpnDebug.sh | tee /tmp/debug.txt $SUDO . /opt/pivpn/pivpnDebug.sh | tee /tmp/debug.txt
echo "::: " echo "::: "

View file

@ -8,9 +8,11 @@ printf "::\t/etc/openvpn/easy-rsa/pki\t ::\n:::\t\t\t\t\t:::\n"
ls -LR /etc/openvpn/easy-rsa/pki/ -Ireqs -Icerts_by_serial ls -LR /etc/openvpn/easy-rsa/pki/ -Ireqs -Icerts_by_serial
printf ":::\t\t\t\t\t:::\n::\tOutput of /etc/pivpn/*\t\t ::\n:::\t\t\t\t\t:::\n" printf ":::\t\t\t\t\t:::\n::\tOutput of /etc/pivpn/*\t\t ::\n:::\t\t\t\t\t:::\n"
for filename in /etc/pivpn/*; do for filename in /etc/pivpn/*; do
echo ":: START $filename ::" if [[ "${filename}" != "/etc/pivpn/install.log" ]]; then
cat "$filename" echo ":: START $filename ::"
echo ":: END $filename ::" cat "$filename"
echo ":: END $filename ::"
fi
done done
printf ":::\t\t\t\t\t:::\n:: /etc/openvpn/easy-rsa/pki/Default.txt ::\n:::\t\t\t\t\t:::\n" printf ":::\t\t\t\t\t:::\n:: /etc/openvpn/easy-rsa/pki/Default.txt ::\n:::\t\t\t\t\t:::\n"
cat /etc/openvpn/easy-rsa/pki/Default.txt cat /etc/openvpn/easy-rsa/pki/Default.txt