This commit is contained in:
hwdsl2 2022-03-18 21:52:20 -05:00
parent 66ceb90555
commit 742e43ffcd
5 changed files with 20 additions and 23 deletions

View File

@ -150,7 +150,7 @@ confirm_or_abort() {
show_header() { show_header() {
cat <<'EOF' cat <<'EOF'
IKEv2 Script Copyright (c) 2020-2022 Lin Song 3 Mar 2022 IKEv2 Script Copyright (c) 2020-2022 Lin Song 19 Mar 2022
EOF EOF
} }
@ -311,6 +311,7 @@ set_dns_servers() {
show_welcome() { show_welcome() {
cat <<'EOF' cat <<'EOF'
Welcome! Use this script to set up IKEv2 on your VPN server. Welcome! Use this script to set up IKEv2 on your VPN server.
I need to ask you a few questions before starting setup. I need to ask you a few questions before starting setup.
You can use the default options and just press enter if you are OK with them. You can use the default options and just press enter if you are OK with them.
@ -1219,12 +1220,6 @@ cat <<EOF
*IMPORTANT* Password for client config files: *IMPORTANT* Password for client config files:
$p12_password $p12_password
Write this down, you'll need it for import! Write this down, you'll need it for import!
EOF
else
cat <<'EOF'
Note: No password is required when importing
client configuration.
EOF EOF
fi fi
cat <<'EOF' cat <<'EOF'
@ -1232,6 +1227,8 @@ cat <<'EOF'
Next steps: Configure IKEv2 VPN clients. See: Next steps: Configure IKEv2 VPN clients. See:
https://git.io/ikev2clients https://git.io/ikev2clients
Send feedback: https://bit.ly/vpn-feedback
================================================ ================================================
EOF EOF

View File

@ -198,16 +198,16 @@ get_helper_scripts() {
add_url="$base_url/add_vpn_user.sh" add_url="$base_url/add_vpn_user.sh"
del_url="$base_url/del_vpn_user.sh" del_url="$base_url/del_vpn_user.sh"
cd /opt/src || exit 1 cd /opt/src || exit 1
printf '%s' "+ "
for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
[ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url" [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
[ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url" [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
[ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url" [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
( printf '%s' "$sc "
set -x wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
wget -t 3 -T 30 -q -O "$sc" "$dl_url"
) || /bin/rm -f "$sc"
[ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
done done
echo
} }
get_swan_ver() { get_swan_ver() {

View File

@ -198,16 +198,16 @@ get_helper_scripts() {
add_url="$base_url/add_vpn_user.sh" add_url="$base_url/add_vpn_user.sh"
del_url="$base_url/del_vpn_user.sh" del_url="$base_url/del_vpn_user.sh"
cd /opt/src || exit 1 cd /opt/src || exit 1
printf '%s' "+ "
for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
[ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url" [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
[ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url" [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
[ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url" [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
( printf '%s' "$sc "
set -x wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
wget -t 3 -T 30 -q -O "$sc" "$dl_url"
) || /bin/rm -f "$sc"
[ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
done done
echo
} }
get_swan_ver() { get_swan_ver() {

View File

@ -258,16 +258,16 @@ get_helper_scripts() {
add_url="$base_url/add_vpn_user.sh" add_url="$base_url/add_vpn_user.sh"
del_url="$base_url/del_vpn_user.sh" del_url="$base_url/del_vpn_user.sh"
cd /opt/src || exit 1 cd /opt/src || exit 1
printf '%s' "+ "
for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
[ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url" [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
[ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url" [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
[ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url" [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
( printf '%s' "$sc "
set -x wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
wget -t 3 -T 30 -q -O "$sc" "$dl_url"
) || /bin/rm -f "$sc"
[ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
done done
echo
} }
get_swan_ver() { get_swan_ver() {

View File

@ -238,16 +238,16 @@ get_helper_scripts() {
add_url="$base_url/add_vpn_user.sh" add_url="$base_url/add_vpn_user.sh"
del_url="$base_url/del_vpn_user.sh" del_url="$base_url/del_vpn_user.sh"
cd /opt/src || exit 1 cd /opt/src || exit 1
printf '%s' "+ "
for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do for sc in ikev2.sh addvpnuser.sh delvpnuser.sh; do
[ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url" [ "$sc" = "ikev2.sh" ] && dl_url="$ikev2_url"
[ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url" [ "$sc" = "addvpnuser.sh" ] && dl_url="$add_url"
[ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url" [ "$sc" = "delvpnuser.sh" ] && dl_url="$del_url"
( printf '%s' "$sc "
set -x wget -t 3 -T 30 -q -O "$sc" "$dl_url" || /bin/rm -f "$sc"
wget -t 3 -T 30 -q -O "$sc" "$dl_url"
) || /bin/rm -f "$sc"
[ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null [ -s "$sc" ] && chmod +x "$sc" && ln -s "/opt/src/$sc" /usr/bin 2>/dev/null
done done
echo
} }
get_swan_ver() { get_swan_ver() {