From 1c802bf49a8fdbe1675b4eece3768c414adcd247 Mon Sep 17 00:00:00 2001
From: Oleg Moskalenko <mom040267@gmail.com>
Date: Sat, 20 Aug 2016 23:34:42 -0700
Subject: [PATCH] CentOS 7 setup updated

---
 ChangeLog                |  1 +
 rpm/CentOS7.pre.build.sh |  2 +-
 rpm/epel7.install.sh     | 35 ++---------------------------------
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 068d4e2f..c220da98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 08/20/2016 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.5.0.4 'dan Eider':
 	- OpenSSL 1.1.0 support added.
+	- CentOS 7 installation updated.
 	- hiredis and mongo compilation configuration fixed
 	(fix provided by Harsha Bellur).
 	- RPM: Systemd optimization.
diff --git a/rpm/CentOS7.pre.build.sh b/rpm/CentOS7.pre.build.sh
index 1dda260b..e7be72ef 100755
--- a/rpm/CentOS7.pre.build.sh
+++ b/rpm/CentOS7.pre.build.sh
@@ -26,7 +26,7 @@ cd ${CPWD}
  
 # Platform file
 
-echo "CentOS7.1" > ${BUILDDIR}/platform
+echo "CentOS7.2" > ${BUILDDIR}/platform
 
 cp ${CPWD}/epel7.install.sh ${BUILDDIR}/install.sh
 
diff --git a/rpm/epel7.install.sh b/rpm/epel7.install.sh
index 01a1390e..789feef6 100755
--- a/rpm/epel7.install.sh
+++ b/rpm/epel7.install.sh
@@ -1,39 +1,8 @@
 #!/bin/bash
 
-CPWD=`pwd`
-
 # Epel installation script
 
-EPEL=epel-release-7-6.noarch
-EPELRPM=${EPEL}.rpm
-BUILDDIR=~/rpmbuild
-WGETOPTIONS="--no-check-certificate"
-RPMOPTIONS="-ivh --force"
-
-mkdir -p ${BUILDDIR}
-mkdir -p ${BUILDDIR}/RPMS
-
-sudo yum -y install wget
-
-cd ${BUILDDIR}/RPMS
-if ! [ -f ${EPELRPM} ] ; then
-    wget ${WGETOPTIONS} http://download.fedoraproject.org/pub/epel/7/x86_64/e/${EPELRPM}
-    ER=$?
-    if ! [ ${ER} -eq 0 ] ; then
-	cd ${CPWD}
-	exit -1
-    fi
-fi
-
-PACK=${EPELRPM}
-sudo rpm ${RPMOPTIONS} ${PACK}
-ER=$?
-if ! [ ${ER} -eq 0 ] ; then
-    echo "Cannot install package ${PACK}"
-    cd ${CPWD}
-    exit -1
-fi
-
-cd ${CPWD}
+sudo yum -y install epel-release
+