valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into develop

Browse Source
This commit is contained in:
Colton Myers 2014-07-29 09:56:15 -06:00
commit f0b74800c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cloud/deploy/bootstrap-salt.sh
View File

@ -2434,7 +2434,9 @@ __install_epel_repository() {
EPEL_ARCH=$CPU_ARCH_L
fi
if [ "$DISTRO_MAJOR_VERSION" -eq 5 ]; then
rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/5/${EPEL_ARCH}/epel-release-5-4.noarch.rpm" || return 1
# Use dl.fedoraproject.org to avoid redirect breakage:
# https://lists.fedoraproject.org/pipermail/users/2012-February/414558.html
rpm -Uvh --force "http://dl.fedoraproject.org/fedora-epel/5/${EPEL_ARCH}/epel-release-5-4.noarch.rpm" || return 1
elif [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then
rpm -Uvh --force "http://download.fedoraproject.org/pub/epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm" || return 1
elif [ "$DISTRO_MAJOR_VERSION" -eq 7 ]; then