rms/setup-ipsec-vpn
1
0
Fork 0
mirror of https://github.com/hwdsl2/setup-ipsec-vpn.git synced 2026-05-17 08:05:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update OS support

Browse Source 
- Add CentOS Stream 10
- Add a check for Ubuntu 25.04, which is not currently supported.
This commit is contained in:
hwdsl2
2025-05-13 00:28:40 -05:00
parent 25da664874
commit 909bf12175
8 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extras/ikev2setup.sh
View File

@@ -63,8 +63,11 @@ check_os() {
elif grep -q "release 9" "$rh_file"; then
os_ver=9
grep -qi stream "$rh_file" && os_ver=9s
elif grep -q "release 10" "$rh_file"; then
os_ver=10
grep -qi stream "$rh_file" && os_ver=10s
else
exiterr "This script only supports CentOS/RHEL 7-9."
exiterr "This script only supports CentOS/RHEL 7-10."
fi
if [ "$os_type" = "centos" ] \
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -110,14 +113,6 @@ EOF
cat 1>&2 <<EOF
Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
This version of Ubuntu/Debian is too old and not supported.
EOF
exit 1
fi
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
cat 1>&2 <<EOF
Error: This script does not support Ubuntu 24.10.
You may use e.g. Ubuntu 24.04 LTS instead.
EOF
exit 1
fi
@@ -177,7 +172,7 @@ confirm_or_abort() {
show_header() {
cat <<'EOF'
IKEv2 Script Copyright (c) 2020-2025 Lin Song 09 May 2025
IKEv2 Script Copyright (c) 2020-2025 Lin Song 12 May 2025
EOF
}

4
extras/vpnuninstall.sh
View File

@@ -43,8 +43,8 @@ check_os() {
[ -f /etc/oracle-release ] && os_type=ol
grep -qi rocky "$rh_file" && os_type=rocky
grep -qi alma "$rh_file" && os_type=alma
if ! grep -q -E "release (7|8|9)" "$rh_file"; then
exiterr "This script only supports CentOS/RHEL 7-9."
if ! grep -q -E "release (7|8|9|10)" "$rh_file"; then
exiterr "This script only supports CentOS/RHEL 7-10."
fi
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
os_type=amzn

15
extras/vpnupgrade.sh
View File

@@ -54,8 +54,11 @@ check_os() {
elif grep -q "release 9" "$rh_file"; then
os_ver=9
grep -qi stream "$rh_file" && os_ver=9s
elif grep -q "release 10" "$rh_file"; then
os_ver=10
grep -qi stream "$rh_file" && os_ver=10s
else
exiterr "This script only supports CentOS/RHEL 7-9."
exiterr "This script only supports CentOS/RHEL 7-10."
fi
if [ "$os_type" = "centos" ] \
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -104,13 +107,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
EOF
exit 1
fi
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
cat 1>&2 <<EOF
Error: This script does not support Ubuntu 24.10.
Error: This script does not support Ubuntu 24.10 or 25.04.
You may use e.g. Ubuntu 24.04 LTS instead.
EOF
exit 1
exit 1
fi
fi
fi
fi

5
extras/vpnupgrade_centos.sh
View File

@@ -57,8 +57,11 @@ check_os() {
elif grep -q "release 9" "$rh_file"; then
os_ver=9
grep -qi stream "$rh_file" && os_ver=9s
elif grep -q "release 10" "$rh_file"; then
os_ver=10
grep -qi stream "$rh_file" && os_ver=10s
else
exiterr "This script only supports CentOS/RHEL 7-9."
exiterr "This script only supports CentOS/RHEL 7-10."
fi
if [ "$os_type" = "centos" ] \
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then

10
extras/vpnupgrade_ubuntu.sh
View File

@@ -65,13 +65,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
EOF
exit 1
fi
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
cat 1>&2 <<EOF
Error: This script does not support Ubuntu 24.10.
Error: This script does not support Ubuntu 24.10 or 25.04.
You may use e.g. Ubuntu 24.04 LTS instead.
EOF
exit 1
exit 1
fi
fi
}

15
vpnsetup.sh
View File

@@ -84,8 +84,11 @@ check_os() {
elif grep -q "release 9" "$rh_file"; then
os_ver=9
grep -qi stream "$rh_file" && os_ver=9s
elif grep -q "release 10" "$rh_file"; then
os_ver=10
grep -qi stream "$rh_file" && os_ver=10s
else
exiterr "This script only supports CentOS/RHEL 7-9."
exiterr "This script only supports CentOS/RHEL 7-10."
fi
if [ "$os_type" = "centos" ] \
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -136,13 +139,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
EOF
exit 1
fi
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
cat 1>&2 <<EOF
Error: This script does not support Ubuntu 24.10.
Error: This script does not support Ubuntu 24.10 or 25.04.
You may use e.g. Ubuntu 24.04 LTS instead.
EOF
exit 1
exit 1
fi
fi
fi
fi

6
vpnsetup_centos.sh
View File

@@ -89,8 +89,11 @@ check_os() {
elif grep -q "release 9" "$rh_file"; then
os_ver=9
grep -qi stream "$rh_file" && os_ver=9s
elif grep -q "release 10" "$rh_file"; then
os_ver=10
grep -qi stream "$rh_file" && os_ver=10s
else
exiterr "This script only supports CentOS/RHEL 7-9."
exiterr "This script only supports CentOS/RHEL 7-10."
fi
if [ "$os_type" = "centos" ] \
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -282,6 +285,7 @@ install_vpn_pkgs_3() {
yum -y -q install $p1 $p2 >/dev/null
) || exiterr2
if [ "$os_ver" = 9 ] || [ "$os_ver" = 9s ] \
|| [ "$os_ver" = 10 ] || [ "$os_ver" = 10s ] \
|| systemctl is-active --quiet firewalld \
|| systemctl is-active --quiet nftables \
|| grep -qs "hwdsl2 VPN script" /etc/sysconfig/nftables.conf; then

10
vpnsetup_ubuntu.sh
View File

@@ -96,13 +96,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
EOF
exit 1
fi
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
cat 1>&2 <<EOF
Error: This script does not support Ubuntu 24.10.
Error: This script does not support Ubuntu 24.10 or 25.04.
You may use e.g. Ubuntu 24.04 LTS instead.
EOF
exit 1
exit 1
fi
fi
}