Move log configuration to /etc/gruntmasterd/

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 6991b7a00a2481fa67971c225bacaf308dda20e1..4adf80178eb93c868d6b92488916de990ccd63e2 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -149,7 +149,7 @@ sub got_job{
 }
 
 sub run{
-  Log::Log4perl->init('/etc/gruntmasterd-log.conf');
+  Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
   get_logger->info("gruntmasterd $VERSION started");
   chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
   SUBSCRIBE jobs => \&got_job;

diff --git a/selinux/gruntmasterd.fc b/selinux/gruntmasterd.fc
index 6d67f3264835e5abc9a3864c30c7045858cdf405..f011981f7486e815024e4daa6d1d6ff68e811f39 100644 (file)
--- a/selinux/gruntmasterd.fc
+++ b/selinux/gruntmasterd.fc
@@ -2,5 +2,5 @@
 /usr/(local/)?bin/gruntmaster-compile gen_context(system_u:object_r:gruntmaster_compile_exec_t, s0)
 /usr/(local/)?bin/gruntmaster-exec    gen_context(system_u:object_r:gruntmaster_job_exec_t, s0)
 /usr/(local/)?bin/gruntmaster-paged   gen_context(system_u:object_r:gruntmaster_paged_exec_t, s0)
-/etc/gruntmasterd-log.conf            gen_context(system_u:object_r:gruntmasterd_etc_t, s0)
+/etc/gruntmasterd(/.*)?               gen_context(system_u:object_r:gruntmasterd_etc_t, s0)
 /var/log/gruntmasterd                 gen_context(system_u:object_r:gruntmasterd_log_t, s0)