Marown/setup-ipsec-vpn
1
0
Fork 0
mirror of https://github.com/hwdsl2/setup-ipsec-vpn.git synced 2024-06-26 23:55:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
hwdsl2 2022-07-30 00:50:40 -05:00
parent a0d0c42651
commit 066cb14e14
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extras/vpnupgrade_centos.sh
View File

@ -163,14 +163,9 @@ install_pkgs_2() {
erp="--enablerepo"
rp1="$erp=*server-*optional*"
rp2="$erp=*releases-optional*"
rp3="$erp=[Pp]ower[Tt]ools"
if [ "$os_type" = "ol" ] && [ "$os_ver" = "8" ]; then
rp3="$erp=ol8_codeready_builder"
fi
if [ "$os_type" = "ol" ] && [ "$os_ver" = "7" ]; then
rp2="$erp=ol7_optional_latest"
fi
[ "$os_type" = "rhel" ] && rp3="$erp=codeready-builder-for-rhel-8-*"
if [ "$os_ver" = "7" ]; then
(
set -x
@ -179,7 +174,7 @@ install_pkgs_2() {
else
(
set -x
yum "$rp3" -y -q install systemd-devel libevent-devel fipscheck-devel >/dev/null
yum -y -q install systemd-devel libevent-devel >/dev/null
) || exiterr2
fi
}

5
vpnsetup_centos.sh
View File

@ -218,15 +218,12 @@ install_vpn_pkgs_1() {
rp1="$erp=epel"
rp2="$erp=*server-*optional*"
rp3="$erp=*releases-optional*"
rp4="$erp=[Pp]ower[Tt]ools"
if [ "$os_type" = "ol" ] && [ "$os_ver" = "8" ]; then
rp1="$erp=ol8_developer_EPEL"
rp4="$erp=ol8_codeready_builder"
fi
if [ "$os_type" = "ol" ] && [ "$os_ver" = "7" ]; then
rp3="$erp=ol7_optional_latest"
fi
[ "$os_type" = "rhel" ] && rp4="$erp=codeready-builder-for-rhel-8-*"
(
set -x
yum -y -q install nss-devel nspr-devel pkgconfig pam-devel \
@ -256,7 +253,7 @@ install_vpn_pkgs_3() {
else
(
set -x
yum "$rp4" -y -q install $p1 $p2 $p3 >/dev/null
yum -y -q install $p1 $p2 >/dev/null
) || exiterr2
if systemctl is-active --quiet firewalld \
|| systemctl is-active --quiet nftables \