From ace6a7f7ea02ade368522e8fc93502f82d1c4514 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 29 Jun 2021 12:02:38 +0000
Subject: [PATCH] Revert "Disable selinux defaults enforcement in File/Concat
 resources"

This reverts commit 0f00dde75739314270c493528b2160bb80e60ca2.

Reason for revert: Puppet 6.23.0 released

Change-Id: Ifa73e0df926f5ee9daab7c305ed8520de1b14316
---
 fixtures/scenario001.pp | 7 -------
 fixtures/scenario002.pp | 7 -------
 fixtures/scenario003.pp | 7 -------
 fixtures/scenario004.pp | 7 -------
 4 files changed, 28 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 0c3947bef..dfa3407b0 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -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
diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index 01996542d..c9f33ffbb 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.pp
@@ -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
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index be514614a..5d8fefccf 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -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
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 6fe53287b..9bb7ac5a4 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -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.