mirror of
https://github.com/hwdsl2/openvpn-install.git
synced 2026-01-11 10:56:16 +00:00
Improve script reliability
- Retry 'apt-get update' and exit on package install errors.
This commit is contained in:
@@ -136,9 +136,9 @@ if [[ ! -e /etc/openvpn/server/server.conf ]]; then
|
|||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
apt-get -yqq update
|
apt-get -yqq update || apt-get -yqq update
|
||||||
apt-get -yqq install wget >/dev/null
|
apt-get -yqq install wget >/dev/null
|
||||||
)
|
) || exit 1
|
||||||
fi
|
fi
|
||||||
echo
|
echo
|
||||||
echo 'Welcome to this OpenVPN server installer!'
|
echo 'Welcome to this OpenVPN server installer!'
|
||||||
@@ -261,21 +261,21 @@ LimitNPROC=infinity" > /etc/systemd/system/openvpn-server@server.service.d/disab
|
|||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
apt-get -yqq update
|
apt-get -yqq update || apt-get -yqq update
|
||||||
apt-get -yqq install openvpn openssl ca-certificates $firewall >/dev/null
|
apt-get -yqq install openvpn openssl ca-certificates $firewall >/dev/null
|
||||||
)
|
) || exit 1
|
||||||
elif [[ "$os" = "centos" ]]; then
|
elif [[ "$os" = "centos" ]]; then
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
yum -y -q install epel-release >/dev/null
|
yum -y -q install epel-release >/dev/null
|
||||||
yum -y -q install openvpn openssl ca-certificates tar $firewall >/dev/null 2>&1
|
yum -y -q install openvpn openssl ca-certificates tar $firewall >/dev/null 2>&1
|
||||||
)
|
) || exit 1
|
||||||
else
|
else
|
||||||
# Else, OS must be Fedora
|
# Else, OS must be Fedora
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
dnf install -y openvpn openssl ca-certificates tar $firewall >/dev/null
|
dnf install -y openvpn openssl ca-certificates tar $firewall >/dev/null
|
||||||
)
|
) || exit 1
|
||||||
fi
|
fi
|
||||||
# If firewalld was just installed, enable it
|
# If firewalld was just installed, enable it
|
||||||
if [[ "$firewall" == "firewalld" ]]; then
|
if [[ "$firewall" == "firewalld" ]]; then
|
||||||
@@ -462,13 +462,13 @@ WantedBy=multi-user.target" >> /etc/systemd/system/openvpn-iptables.service
|
|||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
yum -y -q install policycoreutils-python >/dev/null
|
yum -y -q install policycoreutils-python >/dev/null
|
||||||
)
|
) || exit 1
|
||||||
else
|
else
|
||||||
# CentOS 8 or Fedora
|
# CentOS 8 or Fedora
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
dnf install -y policycoreutils-python-utils >/dev/null
|
dnf install -y policycoreutils-python-utils >/dev/null
|
||||||
)
|
) || exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
semanage port -a -t openvpn_port_t -p "$protocol" "$port"
|
semanage port -a -t openvpn_port_t -p "$protocol" "$port"
|
||||||
|
|||||||
Reference in New Issue
Block a user