From aed4ad0210532f406c0f2afac9093367445c59ba Mon Sep 17 00:00:00 2001 From: Navratan Gupta Date: Tue, 30 Jun 2020 16:44:10 +0530 Subject: [PATCH 1/3] Added checkOS function Check OS operations have been encapsulated in a function named checkOS --- wireguard-install.sh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/wireguard-install.sh b/wireguard-install.sh index f6768fb..1901bcb 100644 --- a/wireguard-install.sh +++ b/wireguard-install.sh @@ -1,5 +1,23 @@ #!/bin/bash +function checkOS() { + # Check OS version + if [[ -e /etc/debian_version ]]; then + source /etc/os-release + OS=$ID # debian or ubuntu + elif [[ -e /etc/fedora-release ]]; then + source /etc/os-release + OS=$ID + elif [[ -e /etc/centos-release ]]; then + OS=centos + elif [[ -e /etc/arch-release ]]; then + OS=arch + else + echo "Looks like you aren't running this installer on a Debian, Ubuntu, Fedora, CentOS or Arch Linux system" + exit 1 + fi +} + function addClient() { # Load params source /etc/wireguard/params @@ -94,22 +112,7 @@ elif [[ -e /etc/wireguard ]]; then exit 1 fi -# Check OS version -if [[ -e /etc/debian_version ]]; then - source /etc/os-release - OS=$ID # debian or ubuntu -elif [[ -e /etc/fedora-release ]]; then - source /etc/os-release - OS=$ID -elif [[ -e /etc/centos-release ]]; then - OS=centos -elif [[ -e /etc/arch-release ]]; then - OS=arch -else - echo "Looks like you aren't running this installer on a Debian, Ubuntu, Fedora, CentOS or Arch Linux system" - exit 1 -fi - +checkOS # Detect public IPv4 address and pre-fill for the user SERVER_PUB_IPV4=$(ip addr | grep 'inet' | grep -v inet6 | grep -vE '127\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1) read -rp "IPv4 or IPv6 public address: " -e -i "$SERVER_PUB_IPV4" SERVER_PUB_IP From a3d3b851854ff3ab8eafc22550ab292095b2746f Mon Sep 17 00:00:00 2001 From: Navratan Gupta Date: Tue, 30 Jun 2020 17:12:16 +0530 Subject: [PATCH 2/3] Added uninstallation step WireGuard can be uninstalled by running bash wireguard-install.sh uninstall --- wireguard-install.sh | 73 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/wireguard-install.sh b/wireguard-install.sh index 1901bcb..d8fda20 100644 --- a/wireguard-install.sh +++ b/wireguard-install.sh @@ -80,6 +80,69 @@ AllowedIPs = $CLIENT_WG_IPV4/32,$CLIENT_WG_IPV6/128" >>"/etc/wireguard/$SERVER_W echo "It is also available in $HOME/$SERVER_WG_NIC-client-$CLIENT_NAME.conf" } +function uninstall() { + +## To uninstall wireguard and its setup ## + + +#Check OS type +checkOS + +#get WireGuard interface name +SERVER_WG_NIC="wg0" +read -rp "WireGuard interface name: " -e -i "$SERVER_WG_NIC" SERVER_WG_NIC + +ip link set down "$SERVER_WG_NIC" #stop wireguard interface + +#Remove wireguard tool and qrencode +if [[ $OS == 'ubuntu' ]]; then + apt-get remove --purge -y wireguard qrencode + add-apt-repository -y -r ppa:wireguard/wireguard + apt-get autoremove -y +elif [[ $OS == 'debian' ]]; then + apt-get remove --purge -y wireguard qrencode + apt-get autoremove -y +elif [[ $OS == 'fedora' ]]; then + dnf remove -y wireguard-tools qrencode + if [[ $VERSION_ID -lt 32 ]]; then + dnf remove -y wireguard-dkms + dnf copr disable -y jdoss/wireguard + fi + dnf autoremove -y +elif [[ $OS == 'centos' ]]; then + yum -y remove wireguard-dkms wireguard-tools qrencode + yum -y autoremove +elif [[ $OS == 'arch' ]]; then + pacman -Rs --noconfirm wireguard-tools wireguard-arch qrencode +fi + +#Delete /etc/wireguard +rm -rfv /etc/wireguard > /dev/null 2>&1 + +if [[ -e /etc/sysctl.d/wg.conf ]]; then + #Delete wg.conf + rm -fv /etc/sysctl.d/wg.conf +fi + +sysctl --system + +systemctl stop "wg-quick@$SERVER_WG_NIC" +systemctl disable "wg-quick@$SERVER_WG_NIC" +ip link delete "$SERVER_WG_NIC" #delete wireguard interface +# Check if WireGuard is running +systemctl is-active --quiet "wg-quick@$SERVER_WG_NIC" +WG_RUNNING=$? + +if [[ $WG_RUNNING -ne 0 ]]; then + echo "WireGuard failed to uninstall properly." + exit 1 +else + echo "WireGuard uninstalled successfully." + exit 0 +fi + +} + if [ "$EUID" -ne 0 ]; then echo "You need to run this script as root" exit 1 @@ -107,8 +170,16 @@ if [[ $1 == "add-client" ]]; then echo "Please install WireGuard first." exit 1 fi +elif [[ $1 == "uninstall" ]]; then + if [[ -e /etc/wireguard ]]; then + uninstall + exit 0 + else + echo "WireGuard is not installed." + exit 1 + fi elif [[ -e /etc/wireguard ]]; then - echo "WireGuard is already installed. Run with 'add-client' to add a client." + echo "WireGuard is already installed. Run with 'add-client' to add a client or 'uninstall' to remove." exit 1 fi From bd0a0c6255d635b32f79d290432693ae78c18ae4 Mon Sep 17 00:00:00 2001 From: Navratan Gupta Date: Tue, 30 Jun 2020 17:41:30 +0530 Subject: [PATCH 3/3] Consistent comment style --- wireguard-install.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/wireguard-install.sh b/wireguard-install.sh index d8fda20..92730e6 100644 --- a/wireguard-install.sh +++ b/wireguard-install.sh @@ -4,7 +4,8 @@ function checkOS() { # Check OS version if [[ -e /etc/debian_version ]]; then source /etc/os-release - OS=$ID # debian or ubuntu + # debian or ubuntu + OS=$ID elif [[ -e /etc/fedora-release ]]; then source /etc/os-release OS=$ID @@ -85,16 +86,17 @@ function uninstall() { ## To uninstall wireguard and its setup ## -#Check OS type +# Check OS type checkOS -#get WireGuard interface name +# get WireGuard interface name SERVER_WG_NIC="wg0" read -rp "WireGuard interface name: " -e -i "$SERVER_WG_NIC" SERVER_WG_NIC -ip link set down "$SERVER_WG_NIC" #stop wireguard interface +# stop wireguard interface +ip link set down "$SERVER_WG_NIC" -#Remove wireguard tool and qrencode +# Remove wireguard tool and qrencode if [[ $OS == 'ubuntu' ]]; then apt-get remove --purge -y wireguard qrencode add-apt-repository -y -r ppa:wireguard/wireguard @@ -116,11 +118,11 @@ elif [[ $OS == 'arch' ]]; then pacman -Rs --noconfirm wireguard-tools wireguard-arch qrencode fi -#Delete /etc/wireguard +# Delete /etc/wireguard rm -rfv /etc/wireguard > /dev/null 2>&1 if [[ -e /etc/sysctl.d/wg.conf ]]; then - #Delete wg.conf + # Delete wg.conf rm -fv /etc/sysctl.d/wg.conf fi @@ -128,7 +130,8 @@ sysctl --system systemctl stop "wg-quick@$SERVER_WG_NIC" systemctl disable "wg-quick@$SERVER_WG_NIC" -ip link delete "$SERVER_WG_NIC" #delete wireguard interface +# delete wireguard interface +ip link delete "$SERVER_WG_NIC" # Check if WireGuard is running systemctl is-active --quiet "wg-quick@$SERVER_WG_NIC" WG_RUNNING=$?