- single conf.d, package /var/log/network directory

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 2bed76ce60d6434d59346967ab44c392bb0bccd6..3fe62355a9f58ce2131a3eedfbd12379136176d3 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -78,9 +78,8 @@ filter p_alert                { level(alert); };
 filter p_crit          { level(crit); };
 filter p_emergency     { level(emerg); };
 
-# Include custom configurations that should be loaded before the system default
-# log rules.
-@include "/etc/syslog-ng/pre.conf.d/*.conf"
+# Include additional configuration files
+@include "/etc/syslog-ng/conf.d/*.conf"
 
 log { source(s_sys); filter(f_authpriv);                       destination(d_authlog); };
 log { source(s_sys); filter(f_cron);                           destination(d_cron); };
@@ -104,10 +103,6 @@ log { source(s_sys); filter(f_daemon); filter(f_ppp);              destination(d_ppp); };
 log { source(s_sys); filter(f_local6); filter(f_freshclam);    destination(d_freshclam); };
 log { source(s_sys); filter(p_emergency);                      destination(d_console); };
 
-# Include custom configurations that should be loaded after the system default
-# log rules.
-@include "/etc/syslog-ng/post.conf.d/*.conf"
-
 # This is a catchall statement and should catch any messages that were not
 # accepted by any of the previous log statements.
 log { source(s_sys); destination(d_messages); flags(fallback); };

diff --git a/syslog-ng.spec b/syslog-ng.spec
index b51add4729839c961f5ed9318526701a34a44811..f113d9d03aae590c0c722a090aba0339de324c5c 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -502,9 +502,9 @@ fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{syslog-ng/{pre,post}.conf.d,sysconfig,logrotate.d,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{syslog-ng/conf.d,sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
-       $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
+       $RPM_BUILD_ROOT/var/{log/network,lib/%{name}/xsd}
 
 %{__make} -j1 install \
        pkgconfigdir=%{_pkgconfigdir} \
@@ -532,12 +532,12 @@ ln -snf %{slibdir}/$(basename $RPM_BUILD_ROOT%{slibdir}/libsecret-storage.so.*.*
 sed -e 's,#VERSION#,%{mver},' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/syslog-ng/pre.conf.d
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/syslog-ng/pre.conf.d
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/syslog-ng/pre.conf.d
-cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/syslog-ng/post.conf.d
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/syslog-ng/pre.conf.d
-cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/syslog-ng/post.conf.d
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
+cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
+cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/syslog-ng/conf.d
 
 for n in cron daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog; do
        > $RPM_BUILD_ROOT/var/log/$n
@@ -609,15 +609,14 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}@default
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d
-%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/pre.conf.d
-%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/post.conf.d
+%attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/conf.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/pre.conf.d/dhcp.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/pre.conf.d/iptables.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/pre.conf.d/log_remote.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/pre.conf.d/log_server.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/post.conf.d/freshclam.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/post.conf.d/ppp.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/dhcp.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/iptables.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/log_remote.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/log_server.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/freshclam.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/conf.d/ppp.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
 %dir %{moduledir}
@@ -742,6 +741,7 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %{_mandir}/man7/secure-logging.7*
 %{_mandir}/man8/syslog-ng.8*
 
+%attr(750,root,root) %dir /var/log/network
 %attr(640,root,logs) %ghost /var/log/cron
 %attr(640,root,logs) %ghost /var/log/daemon
 %attr(640,root,logs) %ghost /var/log/debug