From 8f09ee9afd9c936af97daddb3c538c56a0a991b0 Mon Sep 17 00:00:00 2001 From: Kaladin Light <0.kaladin@gmail.com> Date: Wed, 25 May 2016 17:58:08 -0400 Subject: [PATCH] Fixes for Debian support --- auto_install/install.sh | 8 ++++---- scripts/removeOVPN.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 7b632ff..662b90f 100644 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -218,7 +218,7 @@ chooseInterface() { avoidStaticIPv4Ubuntu() { # If we are in Ubuntu then they need to have previously set their network, so just use what you have. - whiptail --msgbox --backtitle "IP Information" --title "IP Information" "Since we think you are using Ubuntu, and not Raspbian, we will not configure a static IP for you + whiptail --msgbox --backtitle "IP Information" --title "IP Information" "Since we think you are not using Raspbian, we will not configure a static IP for you. If you are in Amazon then you can not configure a static IP anyway. Just ensure before this installer started you had set an elastic IP on your instance." $r $c } @@ -353,7 +353,7 @@ stopServices() { # Stop openvpn $SUDO echo ":::" $SUDO echo -n "::: Stopping openvpn service..." - if [[ $PLAT == "Ubuntu" ]]; then + if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then $SUDO service openvpn stop || true else $SUDO systemctl stop openvpn.service || true @@ -795,7 +795,7 @@ confNetwork() { if [[ $noUFW -eq 1 ]]; then echo 1 > /tmp/noUFW $SUDO iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o $IPv4dev -j MASQUERADE - if [[ $PLAT == "Ubuntu" ]]; then + if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then $SUDO iptables-save else $SUDO netfilter-persistent save @@ -877,7 +877,7 @@ installPiVPN() { displayFinalMessage() { # Final completion message to user - if [[ $PLAT == "Ubuntu" ]]; then + if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then $SUDO service openvpn start else $SUDO systemctl enable openvpn.service diff --git a/scripts/removeOVPN.sh b/scripts/removeOVPN.sh index fd03177..6f7e433 100644 --- a/scripts/removeOVPN.sh +++ b/scripts/removeOVPN.sh @@ -63,7 +63,7 @@ if [ $REVOKE_STATUS == 0 ]; then printf "\nThis seems to be the first time you have revoked a cert.\n" printf "We are adding the CRL to the server.conf and restarting openvpn.\n" sed -i '/#crl-verify/c\crl-verify /etc/openvpn/crl.pem' /etc/openvpn/server.conf - if [[ ${PLAT} == "Ubuntu" ]]; then + if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then service openvpn restart else systemctl restart openvpn.service