From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 27 Jan 2014 09:23:30 +0000 (+0200)
Subject: Move log configuration to /etc/gruntmasterd/
X-Git-Tag: 5999.000_001~32
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=bd084fbe3a4319f35261aec5b783b2be42d01192;p=gruntmaster-daemon.git

Move log configuration to /etc/gruntmasterd/
---

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 6991b7a..4adf801 100644
--- 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 6d67f32..f011981 100644
--- 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)