Revert "Disable selinux defaults enforcement in File/Concat resources"
This reverts commit 0f00dde757
.
Reason for revert: Puppet 6.23.0 released
Change-Id: Ifa73e0df926f5ee9daab7c305ed8520de1b14316
This commit is contained in:
parent
575a1fca61
commit
ace6a7f7ea
@ -20,13 +20,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
|
||||
$ssl = true
|
||||
}
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
# (amoralej) - disable selinux defaults until
|
||||
# https://tickets.puppetlabs.com/browse/PUP-7559 is fixed
|
||||
Concat { selinux_ignore_defaults => true }
|
||||
File { selinux_ignore_defaults => true }
|
||||
}
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
$ipv6 = false
|
||||
|
@ -22,13 +22,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
|
||||
$ssl = true
|
||||
}
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
# (amoralej) - disable selinux defaults until
|
||||
# https://tickets.puppetlabs.com/browse/PUP-7559 is fixed
|
||||
Concat { selinux_ignore_defaults => true }
|
||||
File { selinux_ignore_defaults => true }
|
||||
}
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
$ipv6 = false
|
||||
|
@ -20,13 +20,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
|
||||
$ssl = true
|
||||
}
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
# (amoralej) - disable selinux defaults until
|
||||
# https://tickets.puppetlabs.com/browse/PUP-7559 is fixed
|
||||
Concat { selinux_ignore_defaults => true }
|
||||
File { selinux_ignore_defaults => true }
|
||||
}
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
$ipv6 = false
|
||||
|
@ -20,13 +20,6 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
|
||||
$ssl = true
|
||||
}
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
# (amoralej) - disable selinux defaults until
|
||||
# https://tickets.puppetlabs.com/browse/PUP-7559 is fixed
|
||||
Concat { selinux_ignore_defaults => true }
|
||||
File { selinux_ignore_defaults => true }
|
||||
}
|
||||
|
||||
if $::operatingsystem == 'Ubuntu' {
|
||||
$ipv6 = false
|
||||
# Watcher packages are not available in Ubuntu repository.
|
||||
|
Loading…
Reference in New Issue
Block a user