diff --git a/manifests/init.pp b/manifests/init.pp index 45c4f9783..67fda1d9b 100644 --- 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 index b19e95e86..af87bf6e6 100644 --- 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']) {