Merge branch 'jenkins-build-4' into 'master'

Auto-merge for build 4 See merge request puppet/confdroid_selinux!4
Merge remote-tracking branch 'origin/master' into jenkins-build-4
2026-04-05 17:11:26 +02:00 · 2026-04-05 17:09:22 +02:00 · 2026-04-05 17:09:07 +02:00 · 2026-04-05 14:57:47 +00:00
2 changed files with 3 additions and 2 deletions
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ All files and directories are configured with correct selinux context. If selinu
 ## Known Problems
- Systems reconfigured with selinux disabled require once a reboot for selinux to be enabled. This module will **__not__*- do the reboot for you to avoid unexpected outages.
+- Systems reconfigured with selinux disabled require once a reboot for selinux to be enabled. This module will **not**- do the reboot for you to avoid unexpected outages.
 ## Support
--- a/templates/main/selinux_config.erb
+++ b/templates/main/selinux_config.erb
@@ -1,6 +1,7 @@
 ################################################################################
 ##########        /etc/selinux/config managed by Puppet               ##########
-##########        manual changes will be overwritten !!!              ##########
+##########        manual changes will be overwritten !!!              ##########   
 ##########        original file: https://3for.me/wdtuj                ##########
 ################################################################################
 SELINUX=<%= @sx_selinux_status %>
Author	SHA1	Message	Date
Jenkins	1e886384e3	Merge branch 'jenkins-build-4' into 'master' Auto-merge for build 4 See merge request puppet/confdroid_selinux!4	2026-04-05 17:11:26 +02:00
Jenkins Server	d7a244b217	Merge remote-tracking branch 'origin/master' into jenkins-build-4	2026-04-05 17:09:22 +02:00
12ww1160	a5e4dc02ba	OP#563 fix package name	2026-04-05 17:09:07 +02:00
Jenkins	2557193779	Merge branch 'jenkins-build-3' into 'master' Auto-merge for build 3 See merge request puppet/confdroid_selinux!3	2026-04-05 14:57:47 +00:00