Compare commits
No commits in common. "cffad95ab3fa5dd131227c5ebe2986c1f1176b10" and "001b363a079ccc27fc933d523764c3e00c657114" have entirely different histories.
cffad95ab3
...
001b363a07
2
.github/workflows/test_set_2.yml
vendored
2
.github/workflows/test_set_2.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
|||||||
if: github.repository_owner == 'hwdsl2'
|
if: github.repository_owner == 'hwdsl2'
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:11", "debian:10", "debian:9", "alpine:3.15", "alpine:3.16"]
|
os_version: ["ubuntu:22.04", "ubuntu:20.04", "ubuntu:18.04", "debian:11", "debian:10", "debian:9", "alpine:3.14", "alpine:3.15"]
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
container:
|
container:
|
||||||
image: ${{ matrix.os_version }}
|
image: ${{ matrix.os_version }}
|
||||||
|
@ -77,7 +77,7 @@ https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/vpnsetup.sh
|
|||||||
- Oracle Linux 8 或者 7
|
- Oracle Linux 8 或者 7
|
||||||
- Red Hat Enterprise Linux (RHEL) 8 或者 7
|
- Red Hat Enterprise Linux (RHEL) 8 或者 7
|
||||||
- Amazon Linux 2
|
- Amazon Linux 2
|
||||||
- Alpine Linux 3.16 或者 3.15
|
- Alpine Linux 3.15 或者 3.14
|
||||||
|
|
||||||
这也包括公共云服务中的 Linux 虚拟机,例如 [DigitalOcean](https://blog.ls20.com/digitalocean), [Vultr](https://blog.ls20.com/vultr), [Linode](https://blog.ls20.com/linode), [OVH](https://www.ovhcloud.com/en/vps/) 和 [Microsoft Azure](https://azure.microsoft.com)。公共云用户也可以使用[用户数据](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup)部署。
|
这也包括公共云服务中的 Linux 虚拟机,例如 [DigitalOcean](https://blog.ls20.com/digitalocean), [Vultr](https://blog.ls20.com/vultr), [Linode](https://blog.ls20.com/linode), [OVH](https://www.ovhcloud.com/en/vps/) 和 [Microsoft Azure](https://azure.microsoft.com)。公共云用户也可以使用[用户数据](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup)部署。
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ A cloud server, virtual private server (VPS) or dedicated server, freshly instal
|
|||||||
- Oracle Linux 8 or 7
|
- Oracle Linux 8 or 7
|
||||||
- Red Hat Enterprise Linux (RHEL) 8 or 7
|
- Red Hat Enterprise Linux (RHEL) 8 or 7
|
||||||
- Amazon Linux 2
|
- Amazon Linux 2
|
||||||
- Alpine Linux 3.16 or 3.15
|
- Alpine Linux 3.15 or 3.14
|
||||||
|
|
||||||
This also includes Linux VMs in public clouds, such as [DigitalOcean](https://blog.ls20.com/digitalocean), [Vultr](https://blog.ls20.com/vultr), [Linode](https://blog.ls20.com/linode), [OVH](https://www.ovhcloud.com/en/vps/) and [Microsoft Azure](https://azure.microsoft.com). Public cloud users can also deploy using [user data](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup).
|
This also includes Linux VMs in public clouds, such as [DigitalOcean](https://blog.ls20.com/digitalocean), [Vultr](https://blog.ls20.com/vultr), [Linode](https://blog.ls20.com/linode), [OVH](https://www.ovhcloud.com/en/vps/) and [Microsoft Azure](https://azure.microsoft.com). Public cloud users can also deploy using [user data](https://blog.ls20.com/ipsec-l2tp-vpn-auto-setup-for-ubuntu-12-04-on-amazon-ec2/#vpnsetup).
|
||||||
|
|
||||||
|
@ -79,8 +79,8 @@ EOF
|
|||||||
esac
|
esac
|
||||||
if [ "$os_type" = "alpine" ]; then
|
if [ "$os_type" = "alpine" ]; then
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
||||||
|
@ -90,8 +90,8 @@ EOF
|
|||||||
esac
|
esac
|
||||||
if [ "$os_type" = "alpine" ]; then
|
if [ "$os_type" = "alpine" ]; then
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
||||||
|
@ -115,8 +115,8 @@ EOF
|
|||||||
esac
|
esac
|
||||||
if [ "$os_type" = "alpine" ]; then
|
if [ "$os_type" = "alpine" ]; then
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
||||||
|
@ -83,8 +83,8 @@ EOF
|
|||||||
esac
|
esac
|
||||||
if [ "$os_type" = "alpine" ]; then
|
if [ "$os_type" = "alpine" ]; then
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
||||||
|
@ -51,8 +51,8 @@ check_os() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,8 +115,8 @@ EOF
|
|||||||
esac
|
esac
|
||||||
if [ "$os_type" = "alpine" ]; then
|
if [ "$os_type" = "alpine" ]; then
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
|
||||||
|
@ -72,8 +72,8 @@ check_os() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
os_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID" | cut -d '.' -f 1,2)
|
||||||
if [ "$os_ver" != "3.15" ] && [ "$os_ver" != "3.16" ]; then
|
if [ "$os_ver" != "3.14" ] && [ "$os_ver" != "3.15" ]; then
|
||||||
exiterr "This script only supports Alpine Linux 3.15/3.16."
|
exiterr "This script only supports Alpine Linux 3.14/3.15."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user