mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2024-11-28 15:56:01 +03:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirror:3e343f9d3c89dc68f5351313807b7e21cedd5c18
Branches Tags
mirror:master
...
compare: mirror:7e85c81ddb9c7b572b242a66213032637c9f2cc5
Branches Tags
mirror:master

7 Commits
3e343f9d3c ... 7e85c81ddb

Author SHA1 Message Date
hwdsl2
7e85c81ddb Update docs 2023-08-11 00:13:08 -05:00
hwdsl2
58efbe1575 Update tests 2023-08-11 00:11:33 -05:00
hwdsl2
c8bb2bc36c New Libreswan version 
- Support upgrading to Libreswan 4.12.
 2023-08-11 00:08:25 -05:00
hwdsl2
d522d42ba3 New Libreswan version 
- Use new Libreswan version 4.12.
  Ref: https://lists.libreswan.org/pipermail/swan-announce/2023/000051.html
 2023-08-11 00:07:11 -05:00
hwdsl2
0b5b415296 Update tests 2023-08-10 23:34:44 -05:00
hwdsl2
16f5a1d81f Update Alpine Linux versions 
- Add Alpine Linux 3.18 and remove 3.16.
 2023-08-10 23:33:06 -05:00
hwdsl2
a794200306 Update docs 2023-08-10 23:27:34 -05:00
18 changed files with 36 additions and 36 deletions
Show Stats Expand all files Collapse all files

8
.github/workflows/test_set_1.yml vendored
View File

@ -518,13 +518,13 @@ jobs:
cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.9 ""; do
for ver in 4.10 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.11
[ -z "$ver" ] && ver=4.12
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
@ -538,13 +538,13 @@ jobs:
fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.10 ""; do
for ver in 4.11 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.11
[ -z "$ver" ] && ver=4.12
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk

10
.github/workflows/test_set_2.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
if: github.repository_owner == 'hwdsl2'
strategy:
matrix:
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:12", "debian:11", "debian:10", "alpine:3.17", "alpine:3.16"]
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:12", "debian:11", "debian:10", "alpine:3.17", "alpine:3.18"]
fail-fast: false
container:
image: ${{ matrix.os_version }}
@ -491,7 +491,7 @@ jobs:
cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.9 ""; do
for ver in 4.10 ""; do
if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true
fi
@ -500,7 +500,7 @@ jobs:
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.11
[ -z "$ver" ] && ver=4.12
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
@ -514,7 +514,7 @@ jobs:
fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.10 ""; do
for ver in 4.11 ""; do
if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true
fi
@ -523,7 +523,7 @@ jobs:
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.11
[ -z "$ver" ] && ver=4.12
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk

4
README-zh.md
View File

@ -266,7 +266,7 @@ sudo ikev2.sh
**[配置 IPsec/XAuth ("Cisco IPsec") VPN 客户端](docs/clients-xauth-zh.md)**
**阅读 [:book: VPN book](https://books2read.com/vpnzh) 以访问 [额外内容](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC)。**
**阅读 [:book: VPN book](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC) 以访问 [额外内容](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC)。**
开始使用自己的专属 VPN! :sparkles::tada::rocket::sparkles:
@ -313,7 +313,7 @@ https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh
如果无法下载，打开 [vpnupgrade.sh](extras/vpnupgrade.sh)，然后点击右边的 `Raw` 按钮。按快捷键 `Ctrl/Cmd+A` 全选，`Ctrl/Cmd+C` 复制，然后粘贴到你喜欢的编辑器。
</details>
当前支持的 Libreswan 最新版本是 `4.11`。查看已安装版本：`ipsec --version`。
当前支持的 Libreswan 最新版本是 `4.12`。查看已安装版本：`ipsec --version`。
**注：** `xl2tpd` 可以使用系统的软件包管理器进行更新，例如 Ubuntu/Debian 上的 `apt-get`。

4
README.md
View File

@ -266,7 +266,7 @@ Get your computer or device to use the VPN. Please refer to:
**[Configure IPsec/XAuth ("Cisco IPsec") VPN Clients](docs/clients-xauth.md)**
**Read [:book: VPN book](https://books2read.com/vpn) to access [extra content](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J).**
**Read [:book: VPN book](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J) to access [extra content](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J).**
Enjoy your very own VPN! :sparkles::tada::rocket::sparkles:
@ -313,7 +313,7 @@ https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgrade.sh
If you are unable to download, open [vpnupgrade.sh](extras/vpnupgrade.sh), then click the `Raw` button on the right. Press `Ctrl/Cmd+A` to select all, `Ctrl/Cmd+C` to copy, then paste into your favorite editor.
</details>
The latest supported Libreswan version is `4.11`. Check installed version: `ipsec --version`.
The latest supported Libreswan version is `4.12`. Check installed version: `ipsec --version`.
**Note:** `xl2tpd` can be updated using your system's package manager, such as `apt-get` on Ubuntu/Debian.

2
docs/ikev2-howto-zh.md
View File

@ -40,7 +40,7 @@ Libreswan 支持通过使用 RSA 签名算法的 X.509 Machine Certificates 来
在某些情况下，你可能需要更改 IKEv2 服务器地址，例如切换为使用域名，或者在服务器的 IP 更改之后。要了解更多信息，参见 [这一小节](#更改-ikev2-服务器地址)。
</details>
**阅读 [:book: VPN book](https://books2read.com/vpnzh) 以访问 [额外内容](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC)。**
**阅读 [:book: VPN book](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC) 以访问 [额外内容](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-X8X5FVFZC)。**
### Windows 7, 8, 10 和 11

2
docs/ikev2-howto.md
View File

@ -40,7 +40,7 @@ Learn how to change the IKEv2 server address.
In certain circumstances, you may need to change the IKEv2 server address. For example, to switch to use a DNS name, or after server IP changes. Learn more in [this section](#change-ikev2-server-address).
</details>
**Read [:book: VPN book](https://books2read.com/vpn) to access [extra content](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J).**
**Read [:book: VPN book](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J) to access [extra content](https://ko-fi.com/post/Support-this-project-and-get-access-to-supporter-o-O5O7FVF8J).**
### Windows 7, 8, 10 and 11

6
extras/ikev2setup.sh
View File

@ -96,8 +96,8 @@ EOF
esac
if [ "$os_type" = "alpine" ]; then
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
else
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
@ -157,7 +157,7 @@ confirm_or_abort() {
show_header() {
cat <<'EOF'
IKEv2 Script Copyright (c) 2020-2023 Lin Song 11 Feb 2023
IKEv2 Script Copyright (c) 2020-2023 Lin Song 11 Aug 2023
EOF
}

4
extras/quickstart.sh
View File

@ -122,8 +122,8 @@ EOF
esac
if [ "$os_type" = "alpine" ]; then
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
else
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')

4
extras/vpnupgrade.sh
View File

@ -90,8 +90,8 @@ EOF
esac
if [ "$os_type" = "alpine" ]; then
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
else
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')

6
extras/vpnupgrade_alpine.sh
View File

@ -51,8 +51,8 @@ check_os() {
;;
esac
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
}
@ -69,7 +69,7 @@ EOF
}
get_swan_ver() {
swan_ver_cur=4.11
swan_ver_cur=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_amzn.sh
View File

@ -52,7 +52,7 @@ EOF
}
get_swan_ver() {
swan_ver_cur=4.11
swan_ver_cur=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/upg-v1-amzn-2-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_centos.sh
View File

@ -85,7 +85,7 @@ EOF
}
get_swan_ver() {
swan_ver_cur=4.11
swan_ver_cur=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_ubuntu.sh
View File

@ -84,7 +84,7 @@ EOF
}
get_swan_ver() {
swan_ver_cur=4.11
swan_ver_cur=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

4
vpnsetup.sh
View File

@ -122,8 +122,8 @@ EOF
esac
if [ "$os_type" = "alpine" ]; then
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
else
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')

6
vpnsetup_alpine.sh
View File

@ -70,8 +70,8 @@ check_os() {
;;
esac
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
if [ "$os_ver" != "3.16" ] && [ "$os_ver" != "3.17" ]; then
exiterr "This script only supports Alpine Linux 3.16/3.17."
if [ "$os_ver" != "3.17" ] && [ "$os_ver" != "3.18" ]; then
exiterr "This script only supports Alpine Linux 3.17/3.18."
fi
}
@ -240,7 +240,7 @@ get_helper_scripts() {
}
get_swan_ver() {
SWAN_VER=4.11
SWAN_VER=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
vpnsetup_amzn.sh
View File

@ -258,7 +258,7 @@ get_helper_scripts() {
}
get_swan_ver() {
SWAN_VER=4.11
SWAN_VER=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/v1-amzn-2-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
vpnsetup_centos.sh
View File

@ -360,7 +360,7 @@ get_helper_scripts() {
}
get_swan_ver() {
SWAN_VER=4.11
SWAN_VER=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)

2
vpnsetup_ubuntu.sh
View File

@ -344,7 +344,7 @@ get_helper_scripts() {
}
get_swan_ver() {
SWAN_VER=4.11
SWAN_VER=4.12
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 2 -T 10 -qO- "$swan_ver_url" | head -n 1)