Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Have debug work without being root

Browse source
This commit is contained in:
Kaladin Light 2017-01-27 17:46:34 -05:00
parent 5ce48cbaaf
commit dc9924f147
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
auto_install/install.sh
View file

@ -244,6 +244,8 @@ chooseInterface() {
if [[ $(echo "${availableInterfaces}" | wc -l) -eq 1 ]]; then if [[ $(echo "${availableInterfaces}" | wc -l) -eq 1 ]]; then
pivpnInterface="${availableInterfaces}" pivpnInterface="${availableInterfaces}"
echo "${pivpnInterface}" > /tmp/pivpnINT
$SUDO cp /tmp/pivpnINT /etc/pivpn/pivpnINTERFACE
return return
fi fi

6
pivpn
View file

@ -29,14 +29,14 @@ function listOVPNFunc {
function debugFunc { function debugFunc {
noUFW=$(cat /etc/pivpn/NO_UFW) 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 "::: "
echo "::: Debug output completed above." echo "::: Debug output completed above."
echo "::: Copy saved to /tmp/debug.txt" echo "::: Copy saved to /tmp/debug.txt"
echo "::: " echo "::: "
if [[ ${noUFW} -eq 1 ]]; then if [[ ${noUFW} -eq 1 ]]; then
IPTABLES_FIX=`iptables -t nat -L -n -v | grep -c 'MASQUERADE.*10.8.0.0\/24'` IPTABLES_FIX=`$SUDO iptables -t nat -L -n -v | grep -c 'MASQUERADE.*10.8.0.0\/24'`
iptables -t nat -L -n -v | grep -q 'MASQUERADE.*10.8.0.0\/24' $SUDO iptables -t nat -L -n -v | grep -q 'MASQUERADE.*10.8.0.0\/24'
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
IPTABLES_FIX=2 IPTABLES_FIX=2
fi fi