mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2024-11-23 21:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirror:963a49d61ad7a0d11d7fd2cba3e7fc55e21f5a1e
Branches Tags
mirror:master
..
compare: mirror:ffb22c485800019cbf553ebf3c55eb83ff3941a3
Branches Tags
mirror:master

No commits in common. "963a49d61ad7a0d11d7fd2cba3e7fc55e21f5a1e" and "ffb22c485800019cbf553ebf3c55eb83ff3941a3" have entirely different histories.
963a49d61a ... ffb22c4858

12 changed files with 16 additions and 19 deletions
Show Stats Expand all files Collapse all files

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

@ -465,13 +465,12 @@ jobs:
cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh 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 sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.5 ""; do for ver in 4.4 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS bash vpnup.sh <<ANSWERS
ANSWERS ANSWERS
restart_ipsec restart_ipsec
[ -z "$ver" ] && ver=4.7
ipsec --version | grep "$ver" ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk ipsec status | grep -q xauth-psk
@ -485,13 +484,12 @@ jobs:
fi fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.6 ""; do for ver in 4.5 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS bash vpnup.sh <<ANSWERS
ANSWERS ANSWERS
restart_ipsec restart_ipsec
[ -z "$ver" ] && ver=4.7
ipsec --version | grep "$ver" ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk ipsec status | grep -q xauth-psk

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

@ -77,7 +77,7 @@ jobs:
echo "# hwdsl2" > run.sh echo "# hwdsl2" > run.sh
if [ "$os_type" = "alpine" ]; then if [ "$os_type" = "alpine" ]; then
apk add -U wget rsyslog sed bash apk add -U wget rsyslog sed
rsyslogd rsyslogd
else else
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
@ -480,7 +480,8 @@ jobs:
cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.5 ""; do [ "$os_type" = "alpine" ] && ver1=4.5 || ver1=4.4
for ver in "$ver1" ""; do
if [ "$os_type" = "alpine" ]; then if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true ipsec whack --shutdown || true
fi fi
@ -489,7 +490,6 @@ jobs:
ANSWERS ANSWERS
restart_ipsec restart_ipsec
[ -z "$ver" ] && ver=4.7
ipsec --version | grep "$ver" ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk ipsec status | grep -q xauth-psk
@ -503,7 +503,7 @@ jobs:
fi fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.6 ""; do for ver in 4.5 ""; do
if [ "$os_type" = "alpine" ]; then if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true ipsec whack --shutdown || true
fi fi
@ -512,7 +512,6 @@ jobs:
ANSWERS ANSWERS
restart_ipsec restart_ipsec
[ -z "$ver" ] && ver=4.7
ipsec --version | grep "$ver" ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk ipsec status | grep -q xauth-psk

2
README-zh.md
View File

@ -235,7 +235,7 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgr
如果无法下载，打开 [vpnupgrade.sh](extras/vpnupgrade.sh)，然后点击右边的 `Raw` 按钮。按快捷键 `Ctrl/Cmd+A` 全选，`Ctrl/Cmd+C` 复制，然后粘贴到你喜欢的编辑器。 如果无法下载，打开 [vpnupgrade.sh](extras/vpnupgrade.sh)，然后点击右边的 `Raw` 按钮。按快捷键 `Ctrl/Cmd+A` 全选，`Ctrl/Cmd+C` 复制，然后粘贴到你喜欢的编辑器。
</details> </details>
当前支持的 Libreswan 最新版本是 `4.7`。查看已安装版本：`ipsec --version`。 当前支持的 Libreswan 最新版本是 `4.6`。查看已安装版本：`ipsec --version`。
**注：** `xl2tpd` 可以使用系统的软件包管理器进行更新，例如 Ubuntu/Debian 上的 `apt-get`。 **注：** `xl2tpd` 可以使用系统的软件包管理器进行更新，例如 Ubuntu/Debian 上的 `apt-get`。

2
README.md
View File

@ -235,7 +235,7 @@ curl -fsSL https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras/vpnupgr
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. 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> </details>
The latest supported Libreswan version is `4.7`. Check installed version: `ipsec --version`. The latest supported Libreswan version is `4.6`. Check installed version: `ipsec --version`.
**Note:** `xl2tpd` can be updated using your system's package manager, such as `apt-get` on Ubuntu/Debian. **Note:** `xl2tpd` can be updated using your system's package manager, such as `apt-get` on Ubuntu/Debian.

2
extras/vpnupgrade_alpine.sh
View File

@ -69,7 +69,7 @@ EOF
} }
get_swan_ver() { get_swan_ver() {
swan_ver_cur=4.7 swan_ver_cur=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_amzn.sh
View File

@ -52,7 +52,7 @@ EOF
} }
get_swan_ver() { get_swan_ver() {
swan_ver_cur=4.7 swan_ver_cur=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/upg-v1-amzn-2-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_centos.sh
View File

@ -78,7 +78,7 @@ EOF
} }
get_swan_ver() { get_swan_ver() {
swan_ver_cur=4.7 swan_ver_cur=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

2
extras/vpnupgrade_ubuntu.sh
View File

@ -75,7 +75,7 @@ EOF
} }
get_swan_ver() { get_swan_ver() {
swan_ver_cur=4.7 swan_ver_cur=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/upg-v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)

2
vpnsetup_alpine.sh
View File

@ -224,7 +224,7 @@ get_helper_scripts() {
} }
get_swan_ver() { get_swan_ver() {
SWAN_VER=4.7 SWAN_VER=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

2
vpnsetup_amzn.sh
View File

@ -224,7 +224,7 @@ get_helper_scripts() {
} }
get_swan_ver() { get_swan_ver() {
SWAN_VER=4.7 SWAN_VER=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
swan_ver_url="$base_url/v1-amzn-2-swanver" swan_ver_url="$base_url/v1-amzn-2-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

2
vpnsetup_centos.sh
View File

@ -306,7 +306,7 @@ get_helper_scripts() {
} }
get_swan_ver() { get_swan_ver() {
SWAN_VER=4.7 SWAN_VER=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)

2
vpnsetup_ubuntu.sh
View File

@ -275,7 +275,7 @@ get_helper_scripts() {
} }
get_swan_ver() { get_swan_ver() {
SWAN_VER=4.7 SWAN_VER=4.6
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0" 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_url="$base_url/v1-$os_type-$os_ver-swanver"
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1) swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" 2>/dev/null | head -n 1)