You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/30 21:55:51 UTC
git commit: vagrant: make EPEL work for Centos5
Updated Branches:
refs/heads/master 0da423674 -> 055fa203d
vagrant: make EPEL work for Centos5
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/055fa203
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/055fa203
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/055fa203
Branch: refs/heads/master
Commit: 055fa203d824132054cf38f770250deff620fff2
Parents: 0da4236
Author: James Peach <jp...@apache.org>
Authored: Tue Jul 30 12:55:40 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 30 12:55:40 2013 -0700
----------------------------------------------------------------------
contrib/manifests/redhat.pp | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/055fa203/contrib/manifests/redhat.pp
----------------------------------------------------------------------
diff --git a/contrib/manifests/redhat.pp b/contrib/manifests/redhat.pp
index c6a4510..4187823 100644
--- a/contrib/manifests/redhat.pp
+++ b/contrib/manifests/redhat.pp
@@ -14,10 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package {'epel-release-6-8':
- source => 'http://mirror.pnl.gov/epel/6/i386/epel-release-6-8.noarch.rpm',
- provider => rpm,
- ensure => present
+$source = $lsbmajdistrelease ? {
+ '5' => 'http://mirror.pnl.gov/epel/5/i386/epel-release-5-4.noarch.rpm',
+ '6' => 'http://mirror.pnl.gov/epel/6/i386/epel-release-6-8.noarch.rpm',
+ default => 'http://mirror.pnl.gov/epel/7/i386/epel-release-7-2.noarch.rpm',
+}
+
+package {'epel-release':
+ source => $source,
+ provider => rpm,
+ ensure => present,
}
# Base ATS build dependencies.
@@ -36,5 +42,5 @@ package {[
'gdb', 'valgrind', 'git', 'curl', 'screen', 'ccache'
]:
ensure => latest,
- require => Package['epel-release-6-8']
+ require => Package['epel-release']
}