Merge branch '123.07stable'

centmin.sh

@@ -281,6 +281,7 @@ WGETOPT='-cnv --no-dns-cache -4'
 FPMRPM_LIBEVENT=n
 FPMRPM_MEMCACHED=n
 CENTALTREPO_DISABLE=y
+AXIVOREPO_DISABLE=y
 ###############################################################
 
 MACHINE_TYPE=`uname -m` # Used to detect if OS is 64bit or not.

inc/downloadlinks.inc

@@ -12,7 +12,7 @@
     fi
 
 CENTOSFIVEEPELFILE="epel-release-5-4.noarch.rpm"
-CENTOSFIVEEPEL="http://mirror.us.leaseweb.net/epel/5/${ARCH}/${CENTOSFIVEEPELFILE}"
+CENTOSFIVEEPEL="http://epel.mirror.constant.com/5/${ARCH}/${CENTOSFIVEEPELFILE}"
 
 CENTOSFIVERPMFORGEFILE="rpmforge-release-0.5.3-1.el5.rf.${ARCH}.rpm"
 CENTOSFIVERPMFORGE="http://pkgs.repoforge.org/rpmforge-release/${CENTOSFIVERPMFORGEFILE}"
@@ -27,7 +27,7 @@ CENTOSFIVEVARNISHFILE='varnish-release-3.0-1.el5.centos.noarch.rpm'
 CENTOSFIVEVARNISH="http://repo.varnish-cache.org/redhat/varnish-3.0/el5/noarch/varnish-release/${CENTOSFIVEVARNISHFILE}"
 
 CENTOSSIXEPELFILE="epel-release-6-8.noarch.rpm"
-CENTOSSIXEPEL="http://mirror.us.leaseweb.net/epel/6/${RPMFARCH}/${CENTOSSIXEPELFILE}"
+CENTOSSIXEPEL="http://epel.mirror.constant.com/6/${RPMFARCH}/${CENTOSSIXEPELFILE}"
 CENTOSSIXEPELLOCAL="http://centminmod.com/centminmodparts/repos/${CENTOSSIXEPELFILE}"
 
 CENTOSSIXRPMFORGEFILE="rpmforge-release-0.5.3-1.el6.rf.${ARCH}.rpm"
@@ -45,7 +45,7 @@ CENTOSSIXVARNISH="http://repo.varnish-cache.org/redhat/varnish-3.0/el6/noarch/va
 CENTOSSIXVARNISHLOCAL='http://centminmod.com/centminmodparts/repos/${CENTOSSIXVARNISHFILE}'
 
 CENTOSSIXAXIVOFILE="axivo-release-6-1.noarch.rpm"
-CENTOSSIXAXIVO="http://rpm.axivo.com/redhat/${CENTOSSIXAXIVOFILE}"
+CENTOSSIXAXIVO="http://rpm.axivo.com/el/${CENTOSSIXAXIVOFILE}"
 CENTOSSIXAXIVOLOCAL="http://centminmod.com/centminmodparts/repos/${CENTOSSIXAXIVOFILE}"
 
 PCRELINKFILE="pcre-${NGINX_PCREVER}.tar.gz"

inc/downloads.inc

@@ -27,6 +27,7 @@ checklogdetails
 	exit #$ERROR
 else 
 	cecho "Download done." $boldyellow
+	rpm --import http://epel.mirror.constant.com/RPM-GPG-KEY-EPEL-5
 	rpm -i ${CENTOSFIVEEPELFILE}
 	yum${CACHESKIP} -q list ccache 2>&1 >/dev/null
 	ERR=$?
@@ -203,6 +204,7 @@ checklogdetails
 	exit #$ERROR
 else 
 	cecho "Download done." $boldyellow
+	rpm --import http://epel.mirror.constant.com/RPM-GPG-KEY-EPEL-6
 	rpm -i ${CENTOSSIXEPELFILE}
 	yum${CACHESKIP} -q list ccache 2>&1 >/dev/null
 	ERR=$?
@@ -344,6 +346,8 @@ fi
 ####
 # axivo centos 6.x 64bit only
 
+if [[ "$AXIVOREPO_DISABLE" = [nN] ]]; then
+
 if [ ${MACHINE_TYPE} == 'x86_64' ]; then
 
 if [ -s "${CENTOSSIXAXIVOFILE}" ]; then
@@ -377,6 +381,8 @@ fi
 
 fi
 
+fi # AXIVOREPO_DISABLE
+
 ####
 
 

inc/yumpriorities.inc

@@ -335,6 +335,7 @@ fi
 }
 
 yumprioraxivo() {
+if [[ "$AXIVOREPO_DISABLE" = [nN] ]]; then
 cp -p /etc/yum.repos.d/axivo.repo /etc/yum.repos.d/axivo.OLD
 if [ -n "$(grep ^priority /etc/yum.repos.d/axivo.repo)" ]
         then
@@ -358,4 +359,6 @@ cecho "*************************************************" $boldgreen
 cat /etc/yum.repos.d/axivo.repo
 echo ""
 fi
-}
+fi # AXIVOREPO_DISABLE
+}
+