diff --git a/auto_install/install.sh b/auto_install/install.sh index 8a515e8..ea85c58 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -476,13 +476,11 @@ update_repo() { } setCustomProto() { - # Turn the available interfaces into an array so it can be used with a whiptail dialog + # Set the available protocols into an array so it can be used with a whiptail dialog protoArray=() - protoArray+=("udp" "available" "ON") protoArray+=("tcp" "available" "OFF") - # Find out how many interfaces are available to choose from chooseProtoCmd=(whiptail --separate-output --radiolist "Choose A Protocol" $r $c 2) echo "${chooseProtoCmd[@]}" "${protoArray[@]}" chooseProtoOptions=$("${chooseProtoCmd[@]}" "${protoArray[@]}" 2>&1 >/dev/tty) @@ -763,6 +761,7 @@ confOpenVPN() { $SUDO sed -i "s/1194/${PORT}/g" /etc/openvpn/server.conf fi + # if they modified protocol put value in server.conf if [ $PROTO != "udp" ]; then $SUDO sed -i "s/proto udp/proto tcp/g" /etc/openvpn/server.conf fi @@ -886,6 +885,7 @@ confOVPN() { $SUDO sed -i -e "s/1194/${PORT}/g" /etc/openvpn/easy-rsa/keys/Default.txt fi + # if they modified protocol put value in Default.txt for clients to use if [ $PROTO != "udp" ]; then $SUDO sed -i -e "s/proto udp/proto tcp/g" /etc/openvpn/easy-rsa/keys/Default.txt fi diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh index 902faf9..f4c9b33 100644 --- a/scripts/uninstall.sh +++ b/scripts/uninstall.sh @@ -20,6 +20,7 @@ INSTALL_USER=$(cat /etc/pivpn/INSTALL_USER) PLAT=$(cat /etc/pivpn/DET_PLATFORM) NO_UFW=$(cat /etc/pivpn/NO_UFW) PORT=$(cat /etc/pivpn/INSTALL_PORT) +PROTO=$(cat /etc/pivpn/INSTALL_PROTO) # Find the rows and columns rows=$(tput lines) @@ -53,7 +54,7 @@ echo ":::" while true; do read -rp "::: Do you wish to remove $i from your system? [y/n]: " yn case $yn in - [Yy]* ) printf ":::\tRemoving %s..." "$i"; $SUDO apt-get -y remove --purge "$i" &> /dev/null & spinner $!; printf "done!\n"; + [Yy]* ) printf ":::\tRemoving %s..." "$i"; $SUDO apt-get -y remove --purge "$i" &> /dev/null & spinner $!; printf "done!\n"; if [ "$i" == "openvpn" ]; then UINST_OVPN=1 ; fi if [ "$i" == "unattended-upgrades" ]; then UINST_UNATTUPG=1 ; fi break;; @@ -100,15 +101,15 @@ echo ":::" # Disable IPv4 forwarding sed -i '/net.ipv4.ip_forward=1/c\#net.ipv4.ip_forward=1' /etc/sysctl.conf sysctl -p - + if [[ $NO_UFW -eq 0 ]]; then $SUDO sed -i "s/\(DEFAULT_FORWARD_POLICY=\).*/\1\"DROP\"/" /etc/default/ufw - $SUDO sed -i '/START OPENVPN RULES/,/END OPENVPN RULES/ d' /etc/ufw/before.rules + $SUDO sed -i '/START OPENVPN RULES/,/END OPENVPN RULES/ d' /etc/ufw/before.rules $SUDO ufw delete allow from 10.8.0.0/24 >/dev/null - $SUDO ufw delete allow ${PORT}/udp >/dev/null + $SUDO ufw delete allow ${PORT}/${PROTO} >/dev/null $SUDO ufw reload fi - + echo ":::" printf "::: Finished removing PiVPN from your system.\n" printf "::: Reinstall by simpling running\n:::\n:::\tcurl -L https://install.pivpn.io | bash\n:::\n::: at any time!\n:::\n" @@ -132,7 +133,7 @@ while true; do read -rp "::: Do you wish to completely remove PiVPN configuration and installed packages from your system? (You will be prompted for each package) [y/n]: " yn case $yn in [Yy]* ) removeAll; askreboot; break;; - + [Nn]* ) printf "::: Not removing anything, exiting...\n"; break;; esac done