From b8088d3934263c45d0bf2ad25652d989d127f51f Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Wed, 4 Jul 2018 20:07:32 -0500
Subject: [PATCH] Improve EPEL repo

- Improve handling of the EPEL repository. Although uncommon, some systems
  can have epel-release installed but disabled in /etc/yum.repos.d/epel.repo
- Fixes #210
---
 docs/clients-zh.md          |  2 +-
 docs/clients.md             |  2 +-
 extras/vpnupgrade_centos.sh |  8 ++++----
 vpnsetup_centos.sh          | 18 +++++++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/docs/clients-zh.md b/docs/clients-zh.md
index 1e4d390..8e496ef 100644
--- a/docs/clients-zh.md
+++ b/docs/clients-zh.md
@@ -283,7 +283,7 @@ apt-get -y install strongswan xl2tpd
 
 # CentOS & RHEL
 yum -y install epel-release
-yum -y install strongswan xl2tpd
+yum --enablerepo=epel -y install strongswan xl2tpd
 
 # Fedora
 yum -y install strongswan xl2tpd
diff --git a/docs/clients.md b/docs/clients.md
index 4c8b972..1f18504 100644
--- a/docs/clients.md
+++ b/docs/clients.md
@@ -283,7 +283,7 @@ apt-get -y install strongswan xl2tpd
 
 # CentOS & RHEL
 yum -y install epel-release
-yum -y install strongswan xl2tpd
+yum --enablerepo=epel -y install strongswan xl2tpd
 
 # Fedora
 yum -y install strongswan xl2tpd
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index e1726e6..d97a432 100644
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -147,14 +147,14 @@ yum -y install nss-devel nspr-devel pkgconfig pam-devel \
   libcap-ng-devel libselinux-devel curl-devel \
   flex bison gcc make || exiterr2
 
-OPT1='--enablerepo=*server-optional*'
-OPT2='--enablerepo=*releases-optional*'
+REPO1='--enablerepo=*server-optional*'
+REPO2='--enablerepo=*releases-optional*'
 if grep -qs "release 6" /etc/redhat-release; then
   yum -y remove libevent-devel
-  yum "$OPT1" "$OPT2" -y install libevent2-devel fipscheck-devel || exiterr2
+  yum "$REPO1" "$REPO2" -y install libevent2-devel fipscheck-devel || exiterr2
 else
   yum -y install systemd-devel || exiterr2
-  yum "$OPT1" "$OPT2" -y install libevent-devel fipscheck-devel || exiterr2
+  yum "$REPO1" "$REPO2" -y install libevent-devel fipscheck-devel || exiterr2
 fi
 
 # Compile and install Libreswan
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 678b11e..25385e6 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -144,18 +144,22 @@ yum -y install epel-release || yum -y install "$epel_url" || exiterr2
 
 bigecho "Installing packages required for the VPN..."
 
+REPO1='--enablerepo=epel'
+REPO2='--enablerepo=*server-optional*'
+REPO3='--enablerepo=*releases-optional*'
+
 yum -y install nss-devel nspr-devel pkgconfig pam-devel \
   libcap-ng-devel libselinux-devel curl-devel \
-  flex bison gcc make ppp xl2tpd || exiterr2
+  flex bison gcc make ppp || exiterr2
+
+yum "$REPO1" -y install xl2tpd || exiterr2
 
-OPT1='--enablerepo=*server-optional*'
-OPT2='--enablerepo=*releases-optional*'
 if grep -qs "release 6" /etc/redhat-release; then
   yum -y remove libevent-devel
-  yum "$OPT1" "$OPT2" -y install libevent2-devel fipscheck-devel || exiterr2
+  yum "$REPO2" "$REPO3" -y install libevent2-devel fipscheck-devel || exiterr2
 else
   yum -y install systemd-devel iptables-services || exiterr2
-  yum "$OPT1" "$OPT2" -y install libevent-devel fipscheck-devel || exiterr2
+  yum "$REPO2" "$REPO3" -y install libevent-devel fipscheck-devel || exiterr2
 fi
 
 case "$(uname -r)" in
@@ -165,7 +169,7 @@ case "$(uname -r)" in
       l2tp_file="xl2tpd-$L2TP_VER.tar.gz"
       l2tp_url1="https://github.com/xelerance/xl2tpd/archive/v$L2TP_VER.tar.gz"
       l2tp_url2="https://mirrors.kernel.org/ubuntu/pool/universe/x/xl2tpd/xl2tpd_$L2TP_VER.orig.tar.gz"
-      yum "$OPT1" "$OPT2" -y install libpcap-devel || exiterr2
+      yum "$REPO2" "$REPO3" -y install libpcap-devel || exiterr2
       if ! { wget -t 3 -T 30 -nv -O "$l2tp_file" "$l2tp_url1" || wget -t 3 -T 30 -nv -O "$l2tp_file" "$l2tp_url2"; }; then
         exit 1
       fi
@@ -180,7 +184,7 @@ esac
 
 bigecho "Installing Fail2Ban to protect SSH..."
 
-yum -y install fail2ban || exiterr2
+yum "$REPO1" -y install fail2ban || exiterr2
 
 bigecho "Compiling and installing Libreswan..."