From c4f0d21de4a91752a7c2dc9ddafd8ce51055b703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Barboiron?= <ced@winkie.fr>
Date: Fri, 23 Jun 2017 15:07:03 +0200
Subject: [PATCH 1/2] remove example42/yum dependency

fixes #354
---
 manifests/repo/redhat.pp | 25 +++++++++++++++++++++++--
 metadata.json            |  4 ----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/manifests/repo/redhat.pp b/manifests/repo/redhat.pp
index 5885a593..b64bfb05 100644
--- a/manifests/repo/redhat.pp
+++ b/manifests/repo/redhat.pp
@@ -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 => "http://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
+    enabled    => 1,
+    gpgcheck   => 1,
+    gpgkey     => 'http://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 => "http://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
+    enabled    => 1,
+    gpgcheck   => 1,
+    gpgkey     => 'http://rpms.remirepo.net/RPM-GPG-KEY-remi',
+    priority   => 1,
+  }
 }
diff --git a/metadata.json b/metadata.json
index eb6d24e3..d17eb1d7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -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": [

From 817eac130f3956aba1c947e6409ee953911ceb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Barboiron?= <ced@winkie.fr>
Date: Thu, 29 Jun 2017 11:38:02 +0200
Subject: [PATCH 2/2] use https URLs for remirepo

---
 manifests/repo/redhat.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/repo/redhat.pp b/manifests/repo/redhat.pp
index b64bfb05..a4040a17 100644
--- a/manifests/repo/redhat.pp
+++ b/manifests/repo/redhat.pp
@@ -17,19 +17,19 @@
 
   yumrepo { 'remi':
     descr      => 'Remi\'s RPM repository for Enterprise Linux $releasever - $basearch',
-    mirrorlist => "http://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
+    mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
     enabled    => 1,
     gpgcheck   => 1,
-    gpgkey     => 'http://rpms.remirepo.net/RPM-GPG-KEY-remi',
+    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 => "http://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
+    mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
     enabled    => 1,
     gpgcheck   => 1,
-    gpgkey     => 'http://rpms.remirepo.net/RPM-GPG-KEY-remi',
+    gpgkey     => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
     priority   => 1,
   }
 }