Replace the old lrrd fc entries with correct munin ones.

diff --git a/Changelog b/Changelog
index 4eb72ee0d24fc6c808f50bd7f6d2cafddda4882b..6ab7f0742de6cee496a05c2b9eaacb6d304489d9 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Replace the old lrrd fc entries with munin ones.
 - Move program admin template usage out of userdom_admin_user_template() to
   sysadm policy in userdomain.te to fix usage of the template for third
   parties.

diff --git a/policy/modules/services/munin.fc b/policy/modules/services/munin.fc
index 54ca668f387b0ea0faa1e16491bb55050cc92a0f..205f91bf7c59ee0709331a54387e8bdc2217072b 100644 (file)
--- a/policy/modules/services/munin.fc
+++ b/policy/modules/services/munin.fc
@@ -1,11 +1,11 @@
-/etc/lrrd(/.*)?                                gen_context(system_u:object_r:munin_etc_t,s0)
+/etc/munin(/.*)?                       gen_context(system_u:object_r:munin_etc_t,s0)
 
-/usr/bin/lrrd-.*               --      gen_context(system_u:object_r:munin_exec_t,s0)
-/usr/sbin/lrrd-.*              --      gen_context(system_u:object_r:munin_exec_t,s0)
-/usr/share/lrrd/lrrd-.*                --      gen_context(system_u:object_r:munin_exec_t,s0)
-/usr/share/lrrd/plugins/.*     --      gen_context(system_u:object_r:munin_exec_t,s0)
+/usr/bin/munin-.*              --      gen_context(system_u:object_r:munin_exec_t,s0)
+/usr/sbin/munin-.*             --      gen_context(system_u:object_r:munin_exec_t,s0)
+/usr/share/munin/munin-.*      --      gen_context(system_u:object_r:munin_exec_t,s0)
+/usr/share/munin/plugins/.*    --      gen_context(system_u:object_r:munin_exec_t,s0)
 
-/var/lib/lrrd(/.*)?                    gen_context(system_u:object_r:munin_var_lib_t,s0)
-/var/log/lrrd.*                        --      gen_context(system_u:object_r:munin_log_t,s0)
-/var/run/lrrd(/.*)?                    gen_context(system_u:object_r:munin_var_run_t,s0)
-/var/www/lrrd(/.*)?                    gen_context(system_u:object_r:munin_var_lib_t,s0)
+/var/lib/munin(/.*)?                   gen_context(system_u:object_r:munin_var_lib_t,s0)
+/var/log/munin.*               --      gen_context(system_u:object_r:munin_log_t,s0)
+/var/run/munin(/.*)?                   gen_context(system_u:object_r:munin_var_run_t,s0)
+/var/www/munin(/.*)?                   gen_context(system_u:object_r:munin_var_lib_t,s0)

diff --git a/policy/modules/services/munin.te b/policy/modules/services/munin.te
index e1203108bcdef2178c4f9d8cca7f10da8052ade2..24a888799e684d3809244d1590eacd0eea7b3a0c 100644 (file)
--- a/policy/modules/services/munin.te
+++ b/policy/modules/services/munin.te
@@ -1,5 +1,5 @@
 
-policy_module(munin,1.2.0)
+policy_module(munin,1.2.1)
 
 ########################################
 #