Merge pull request voxpupuli#1212 from bastelfreak/purgerepo

allow people to not purge passenger yumrepo
StatensPensjonskasse · May 11, 2018 · 7918ecc · 7918ecc
2 parents a96953b + 770f8ac
commit 7918ecc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -168,6 +168,7 @@
   $nginx_upstreams                                           = {},
   $nginx_servers                                             = {},
   $nginx_servers_defaults                                    = {},
+  Boolean $purge_passenger_repo                              = true,
   ### END Hiera Lookups ###
 ) inherits nginx::params {
 

diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -21,6 +21,7 @@
   $package_flavor           = $nginx::package_flavor
   $passenger_package_ensure = $nginx::passenger_package_ensure
   $manage_repo              = $nginx::manage_repo
+  $purge_passenger_repo     = $nginx::purge_passenger_repo
 
   #Install the CentOS-specific packages on that OS, otherwise assume it's a RHEL
   #clone and provide the Red Hat-specific package. This comes into play when not
@@ -43,11 +44,12 @@
           before   => Package['nginx'],
         }
 
-        yumrepo { 'passenger':
-          ensure => absent,
-          before => Package['nginx'],
+        if $purge_passenger_repo {
+          yumrepo { 'passenger':
+            ensure => absent,
+            before => Package['nginx'],
+          }
         }
-
       }
       'nginx-mainline': {
         yumrepo { 'nginx-release':
@@ -60,11 +62,12 @@
           before   => Package['nginx'],
         }
 
-        yumrepo { 'passenger':
-          ensure => absent,
-          before => Package['nginx'],
+        if $purge_passenger_repo {
+          yumrepo { 'passenger':
+            ensure => absent,
+            before => Package['nginx'],
+          }
         }
-
       }
       'passenger': {
         if ($facts['os']['name'] in ['RedHat', 'CentOS']) and ($facts['os']['release']['major'] in ['6', '7']) {