factory-default/app-admin/syslog-ng: Move template, perm, owner, group to global options

1 files changed, 25 insertions, 13 deletions

diff --git a/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
index 843766dc..2602da23 100644
--- a/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
+++ b/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
@@ -8,6 +8,16 @@ options {
   log-fifo-size (10000);
   use-dns (no);
   use-fqdn (no);
+
+  create-dirs (yes);
+  dir-owner ("root");
+  dir-group ("wheel");
+  dir-perm (0750);
+
+  owner ("root");
+  group ("wheel");
+  perm (0640);
+
   keep-hostname (no);
   log-msg-size (2048);
   chain-hostnames (no);
@@ -23,6 +33,8 @@ options {
   # people so turn it down to once an hour.  Set it to zero
   # if you don't want the functionality at all.
   mark-freq(3600);
+
+  file-template (t_logformat);
 };
 
 source s_local {
@@ -58,19 +70,19 @@ filter f_apache_access { program("httpd")   and facility(local2);              }
 filter f_apache_error  { program("httpd")   and facility(local3);              };
 filter f_php_error     { program("apache2") and facility(user);                };
 
-destination d_auth          { file("/var/log/auth.log"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_cron          { file("/var/log/cron.log"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_daemon        { file("/var/log/daemon.log"         template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_kernel        { file("/var/log/kern.log"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_mail          { file("/var/log/mail.log"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_messages      { file("/var/log/messages"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_user          { file("/var/log/user.log"           template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_debug         { file("/var/log/debug.log"          template(t_logformat) perm(0640) owner("root") group("wheel")); };
-
-destination d_firewall      { file("/var/log/firewall.log"       template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_apache_access { file("/var/log/apache2/access.log" template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_apache_error  { file("/var/log/apache2/error.log"  template(t_logformat) perm(0640) owner("root") group("wheel")); };
-destination d_haproxy       { file("/var/log/haproxy.log"        template(t_logformat) perm(0640) owner("root") group("wheel")); };
+destination d_auth          { file("/var/log/auth.log"          ); };
+destination d_cron          { file("/var/log/cron.log"          ); };
+destination d_daemon        { file("/var/log/daemon.log"        ); };
+destination d_kernel        { file("/var/log/kern.log"          ); };
+destination d_mail          { file("/var/log/mail.log"          ); };
+destination d_messages      { file("/var/log/messages"          ); };
+destination d_user          { file("/var/log/user.log"          ); };
+destination d_debug         { file("/var/log/debug.log"         ); };
+
+destination d_firewall      { file("/var/log/firewall.log"      ); };
+destination d_apache_access { file("/var/log/apache2/access.log"); };
+destination d_apache_error  { file("/var/log/apache2/error.log" ); };
+destination d_haproxy       { file("/var/log/haproxy.log"       ); };
 
 destination d_net {
   syslog("log.as29.net"