mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2024-11-22 13:06:02 +03:00
Code Issues Projects Releases Wiki Activity

Improve OS detection

Browse Source
This commit is contained in:
hwdsl2 2020-01-13 00:07:39 -08:00
parent 4b28ce5de9
commit 4360737eaf
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/add_vpn_user.sh
View File

@ -2,7 +2,7 @@
# #
# Script to add/update an VPN user for both IPsec/L2TP and Cisco IPsec # Script to add/update an VPN user for both IPsec/L2TP and Cisco IPsec
# #
# Copyright (C) 2018-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2018-2020 Lin Song <linsongui@gmail.com>
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
# Unported License: http://creativecommons.org/licenses/by-sa/3.0/ # Unported License: http://creativecommons.org/licenses/by-sa/3.0/

2
extras/del_vpn_user.sh
View File

@ -2,7 +2,7 @@
# #
# Script to delete an VPN user for both IPsec/L2TP and Cisco IPsec # Script to delete an VPN user for both IPsec/L2TP and Cisco IPsec
# #
# Copyright (C) 2018-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2018-2020 Lin Song <linsongui@gmail.com>
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
# Unported License: http://creativecommons.org/licenses/by-sa/3.0/ # Unported License: http://creativecommons.org/licenses/by-sa/3.0/

2
extras/update_vpn_users.sh
View File

@ -2,7 +2,7 @@
# #
# Script to update VPN users for both IPsec/L2TP and Cisco IPsec # Script to update VPN users for both IPsec/L2TP and Cisco IPsec
# #
# Copyright (C) 2018-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2018-2020 Lin Song <linsongui@gmail.com>
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
# Unported License: http://creativecommons.org/licenses/by-sa/3.0/ # Unported License: http://creativecommons.org/licenses/by-sa/3.0/

6
extras/vpnupgrade.sh
View File

@ -2,7 +2,7 @@
# #
# Script to upgrade Libreswan on Ubuntu and Debian # Script to upgrade Libreswan on Ubuntu and Debian
# #
# Copyright (C) 2016-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2016-2020 Lin Song <linsongui@gmail.com>
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
# Unported License: http://creativecommons.org/licenses/by-sa/3.0/ # Unported License: http://creativecommons.org/licenses/by-sa/3.0/
@ -28,7 +28,9 @@ if [ -z "$os_type" ]; then
[ -f /etc/lsb-release ] && os_type=$(. /etc/lsb-release && printf '%s' "$DISTRIB_ID") [ -f /etc/lsb-release ] && os_type=$(. /etc/lsb-release && printf '%s' "$DISTRIB_ID")
fi fi
if ! printf '%s' "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbian; then if ! printf '%s' "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbian; then
exiterr "This script only supports Ubuntu and Debian." echo "Error: This script only supports Ubuntu and Debian." >&2
echo "For CentOS/RHEL, use https://git.io/vpnupgrade-centos" >&2
exit 1
fi fi
if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then

6
extras/vpnupgrade_centos.sh
View File

@ -2,7 +2,7 @@
# #
# Script to upgrade Libreswan on CentOS and RHEL # Script to upgrade Libreswan on CentOS and RHEL
# #
# Copyright (C) 2016-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2016-2020 Lin Song <linsongui@gmail.com>
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
# Unported License: http://creativecommons.org/licenses/by-sa/3.0/ # Unported License: http://creativecommons.org/licenses/by-sa/3.0/
@ -23,7 +23,9 @@ exiterr2() { exiterr "'yum install' failed."; }
vpnupgrade() { vpnupgrade() {
if ! grep -qs -e "release 6" -e "release 7" -e "release 8" /etc/redhat-release; then if ! grep -qs -e "release 6" -e "release 7" -e "release 8" /etc/redhat-release; then
exiterr "This script only supports CentOS/RHEL 6, 7 and 8." echo "Error: This script only supports CentOS/RHEL 6, 7 and 8." >&2
echo "For Ubuntu/Debian, use https://git.io/vpnupgrade" >&2
exit 1
fi fi
if [ -f /proc/user_beancounters ]; then if [ -f /proc/user_beancounters ]; then

6
vpnsetup.sh
View File

@ -8,7 +8,7 @@
# The latest version of this script is available at: # The latest version of this script is available at:
# https://github.com/hwdsl2/setup-ipsec-vpn # https://github.com/hwdsl2/setup-ipsec-vpn
# #
# Copyright (C) 2014-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2014-2020 Lin Song <linsongui@gmail.com>
# Based on the work of Thomas Sarlandie (Copyright 2012) # Based on the work of Thomas Sarlandie (Copyright 2012)
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
@ -54,7 +54,9 @@ if [ -z "$os_type" ]; then
[ -f /etc/lsb-release ] && os_type=$(. /etc/lsb-release && printf '%s' "$DISTRIB_ID") [ -f /etc/lsb-release ] && os_type=$(. /etc/lsb-release && printf '%s' "$DISTRIB_ID")
fi fi
if ! printf '%s' "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbian; then if ! printf '%s' "$os_type" | head -n 1 | grep -qiF -e ubuntu -e debian -e raspbian; then
exiterr "This script only supports Ubuntu and Debian." echo "Error: This script only supports Ubuntu and Debian." >&2
echo "For CentOS/RHEL, use https://git.io/vpnsetup-centos" >&2
exit 1
fi fi
if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then

6
vpnsetup_centos.sh
View File

@ -8,7 +8,7 @@
# The latest version of this script is available at: # The latest version of this script is available at:
# https://github.com/hwdsl2/setup-ipsec-vpn # https://github.com/hwdsl2/setup-ipsec-vpn
# #
# Copyright (C) 2015-2019 Lin Song <linsongui@gmail.com> # Copyright (C) 2015-2020 Lin Song <linsongui@gmail.com>
# Based on the work of Thomas Sarlandie (Copyright 2012) # Based on the work of Thomas Sarlandie (Copyright 2012)
# #
# This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 # This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
@ -49,7 +49,9 @@ check_ip() {
vpnsetup() { vpnsetup() {
if ! grep -qs -e "release 6" -e "release 7" -e "release 8" /etc/redhat-release; then if ! grep -qs -e "release 6" -e "release 7" -e "release 8" /etc/redhat-release; then
exiterr "This script only supports CentOS/RHEL 6, 7 and 8." echo "Error: This script only supports CentOS/RHEL 6, 7 and 8." >&2
echo "For Ubuntu/Debian, use https://git.io/vpnsetup" >&2
exit 1
fi fi
if [ -f /proc/user_beancounters ]; then if [ -f /proc/user_beancounters ]; then