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

Auto-merge for build 8 See merge request puppet/confdroid_selinux!8
Recommit for updates in build 8
2026-04-05 17:59:07 +02:00 · 2026-04-05 17:52:34 +02:00 · 2026-04-05 17:51:47 +02:00 · 2026-04-05 17:51:32 +02:00 · 2026-04-05 15:24:15 +00:00
2 changed files with 6 additions and 6 deletions
--- a/doc/puppet_classes/confdroid_selinux_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_selinux_3A_3Aparams.html
@@ -233,11 +233,11 @@ class confdroid_selinux::params (
  $os_release               = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]

 # directories
-  $sx_main_dir        = &#39;/etc/selinux&#39;
+  $sx_main_dir              = &#39;/etc/selinux&#39;

 # files
-  $sx_main_file       = &quot;${sx_main_dir}/config&quot;
-  $sx_main_file_erb   = &#39;confdroid_selinux/main/selinux_config.erb&#39;
+  $sx_main_file             = &quot;${sx_main_dir}/config&quot;
+  $sx_main_file_erb         = &#39;confdroid_selinux/main/selinux_config.erb&#39;

 # includes must be last
  include confdroid_selinux::main::config
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -36,11 +36,11 @@ class confdroid_selinux::params (
  $os_release               = $facts['os']['release']['major']

 # directories
-  $sx_main_dir        = '/etc/selinux'
+  $sx_main_dir              = '/etc/selinux'

 # files
-  $sx_main_file       = "${sx_main_dir}/config"
-  $sx_main_file_erb   = 'confdroid_selinux/main/selinux_config.erb'
+  $sx_main_file             = "${sx_main_dir}/config"
+  $sx_main_file_erb         = 'confdroid_selinux/main/selinux_config.erb'

 # includes must be last
  include confdroid_selinux::main::config
Author	SHA1	Message	Date
Jenkins	fd61b6adf8	Merge branch 'jenkins-build-8' into 'master' Auto-merge for build 8 See merge request puppet/confdroid_selinux!8	2026-04-05 17:59:07 +02:00
Jenkins Server	0584cedaa6	Recommit for updates in build 8	2026-04-05 17:52:34 +02:00
Jenkins Server	f0696c8855	Merge remote-tracking branch 'origin/master' into jenkins-build-8	2026-04-05 17:51:47 +02:00
12ww1160	054a912251	OP#563 remove ls step	2026-04-05 17:51:32 +02:00
Jenkins	de87db9463	Merge branch 'jenkins-build-7' into 'master' Auto-merge for build 7 See merge request puppet/confdroid_selinux!7	2026-04-05 15:24:15 +00:00