Skip to content

Commit

Permalink
Merge pull request #366 from LEDfan/fix_354_backport_puppet3
Browse files Browse the repository at this point in the history
Backport of #355  remove example42/yum dependency on puppet3 branch
  • Loading branch information
juniorsysadmin authored Sep 29, 2017
2 parents cfdcffc + c4705c2 commit becf5cf
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
25 changes: 23 additions & 2 deletions manifests/repo/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,27 @@
class php::repo::redhat (
$yum_repo = 'remi_php56',
) {
contain "::yum::repo::${yum_repo}"
contain '::yum::repo::remi'

$releasever = $::operatingsystem ? {
/(?i:Amazon)/ => '6',
default => '$releasever', # Yum var
}

yumrepo { 'remi':
descr => 'Remi\'s RPM repository for Enterprise Linux $releasever - $basearch',
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
enabled => 1,
gpgcheck => 1,
gpgkey => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
priority => 1,
}

yumrepo { 'remi-php56':
descr => 'Remi\'s PHP 5.6 RPM repository for Enterprise Linux $releasever - $basearch',
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
enabled => 1,
gpgcheck => 1,
gpgkey => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
priority => 1,
}
}
4 changes: 0 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
{
"name": "puppet/archive",
"version_requirement": ">= 1.0.0 < 2.0.0"
},
{
"name": "example42/yum",
"version_requirement": ">= 2.1.28 < 3.0.0"
}
],
"requirements": [
Expand Down

0 comments on commit becf5cf

Please sign in to comment.