Skip to content

Commit 7e150a9

Browse files
author
Helen
authored
Merge pull request puppetlabs#1060 from ehelms/add-rhel8
Include EL8 version for config checks
2 parents 7d2abd6 + 056eb16 commit 7e150a9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

manifests/server/config.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
# RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
134134
# in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.
135-
if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7/) and ($::operatingsystem != 'Fedora') {
135+
if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7|^8/) and ($::operatingsystem != 'Fedora') {
136136
file { '/etc/sysconfig/pgsql/postgresql':
137137
ensure => present,
138138
replace => false,

manifests/server/config_entry.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
}
113113
}
114114
if $::osfamily == 'RedHat' {
115-
if ! ($::operatingsystemrelease =~ /^7/ or $::operatingsystem == 'Fedora') {
115+
if ! ($::operatingsystemrelease =~ /^7|^8/ or $::operatingsystem == 'Fedora') {
116116
if $name == 'port' {
117117
# We need to force postgresql to stop before updating the port
118118
# because puppet becomes confused and is unable to manage the

0 commit comments

Comments
 (0)