Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue 30. #31

Merged
merged 6 commits into from
Nov 27, 2024
Merged

Fix issue 30. #31

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb071d5
Update fix.
xiahualiu Nov 27, 2024
fe4a603
Update.
xiahualiu Nov 27, 2024
d571517
Update.
xiahualiu Nov 27, 2024
6945c45
Update fix.
xiahualiu Nov 27, 2024
f686758
Update.
xiahualiu Nov 27, 2024
17d04eb
Update.
xiahualiu Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,25 @@ uninstallonDebian() {
}

installAlmaLinux() {
sudo rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
sudo dnf update -y
sudo dnf install -y epel-release elrepo-release
sudo dnf install -y kmod-wireguard wireguard-tools nftables qrencode curl git make wget
if [ "$(echo "${VERSION_ID}" | cut -d'.' -f1)" -ge 9 ]; then
sudo dnf update -y
sudo modprobe wireguard
sudo dnf install -y wireguard-tools nftables qrencode curl git make wget
else
sudo rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
sudo dnf update -y
sudo dnf install -y epel-release elrepo-release
sudo dnf install -y kmod-wireguard wireguard-tools nftables qrencode curl git make wget
fi
}

uninstallAlmaLinux() {
sudo dnf autoremove -y kmod-wireguard wireguard-tools qrencode
if [ "$(echo "${VERSION_ID}" | cut -d'.' -f1)" -ge 9 ]; then
sudo modprobe -r wireguard
sudo dnf autoremove -y wireguard-tools qrencode
else
sudo dnf autoremove -y kmod-wireguard wireguard-tools qrencode
fi
sudo dnf clean all -y
}

Expand Down Expand Up @@ -458,10 +469,10 @@ rmClientWGConfEntry() {

addClientNATEntry() {
local line_n
line_n=$(grep -n "WG_Installer_IP_Rule_Starts" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | cut -d ':' -f '1')
line_n=$(sudo grep -n "WG_Installer_IP_Rule_Starts" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | cut -d ':' -f '1')
sudo sed -i "${line_n}a\ iifname \"$SERVER_PUB_NIC\" udp dport {$CLIENT_FORWARD_PORTS} dnat ip to $CLIENT_WG_IPV4 comment \"WireGuardGamingInstaller_Client_${CLIENT_NAME}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh"
sudo sed -i "${line_n}a\ iifname \"$SERVER_PUB_NIC\" tcp dport {$CLIENT_FORWARD_PORTS} dnat ip to $CLIENT_WG_IPV4 comment \"WireGuardGamingInstaller_Client_${CLIENT_NAME}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh"
line_n=$(grep -n "WG_Installer_IP6_Rule_Starts" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | cut -d ':' -f '1')
line_n=$(sudo grep -n "WG_Installer_IP6_Rule_Starts" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | cut -d ':' -f '1')
sudo sed -i "${line_n}a\ iifname \"$SERVER_PUB_NIC\" udp dport {$CLIENT_FORWARD_PORTS} dnat ip6 to $CLIENT_WG_IPV6 comment \"WireGuardGamingInstaller_Client_${CLIENT_NAME}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh"
sudo sed -i "${line_n}a\ iifname \"$SERVER_PUB_NIC\" tcp dport {$CLIENT_FORWARD_PORTS} dnat ip6 to $CLIENT_WG_IPV6 comment \"WireGuardGamingInstaller_Client_${CLIENT_NAME}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh"
}
Expand Down Expand Up @@ -502,7 +513,7 @@ cleanConfigureWGServer() {
# Clean server conf
sudo rm -f "${WG_CONF_FOLDER}"/*.conf
sudo rm -f "/etc/sysctl.d/wg.conf"
sudo sysctl -p '/etc/sysctl.d/wg.conf'
sudo sysctl --system
# Clean client conf
sudo rm -f "${WG_CONF_FOLDER}"/*.sh
sudo rm -f "${SCRIPT_TEMP_FOLDER}"/*.conf
Expand Down Expand Up @@ -555,7 +566,7 @@ listAllWGClients() {
while read -r line; do
if [[ $line =~ ^'CLIENT_NAME=' ]]; then
line=${line##CLIENT_NAME=}
port=$(grep -oE "dport {.+} dnat.+${line}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | head -1)
port=$(sudo grep -oE "dport {.+} dnat.+${line}\"" "${WG_CONF_FOLDER}/add-fullcone-nat.sh" | head -1)
port=$(echo "$port" | cut -d '{' -f '2' | cut -d '}' -f '1')
echo "* $line [$port]"
fi
Expand Down