From cd16fe6e2cadceacea64b816e85f511339f942f2 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 23 Apr 2007 17:36:35 +0000 Subject: [PATCH] Replace the old lrrd fc entries with correct munin ones. --- Changelog | 1 + policy/modules/services/munin.fc | 18 +++++++++--------- policy/modules/services/munin.te | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Changelog b/Changelog index 4eb72ee0..6ab7f074 100644 --- 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 54ca668f..205f91bf 100644 --- 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 e1203108..24a88879 100644 --- 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) ######################################## #