Merge branch 'sme9' of main:/home/e-smith/files/shares/dev/files/ipasserelle-base into sme9

Conflicts: ipasserelle-base.spec
10 years ago · 05b6ce68d3
parent 8c392fdf5a c44af7780b
commit 05b6ce68d3
4 changed files with 8 additions and 5 deletions
--- a/ipasserelle-base.spec
+++ b/ipasserelle-base.spec
@ -1,4 +1,4 @@
-%define version 0.2.45
+%define version 0.2.46
 %define release 1
 %define name ipasserelle-base

@ -48,9 +48,12 @@ Based on SMEServer, iPasserelle is a specially configured
 SME Server, with some additionnal modules

 %changelog
-* Mon Jun 30 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.45-1
+* Mon Jun 30 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.46-1
 - Replace header_access directive with request_header_access

+* Mon Jun 23 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.45-1
+- Replace syslog templates-custom with rsyslog fragment
+
 * Fri Mar 21 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.44-1
 - Fix AllowedRemoteIP (SPF Whitelist)

--- a/root/etc/e-smith/templates-custom/etc/syslog.conf/local5
+++ b/root/etc/e-smith/templates-custom/etc/syslog.conf/local5
@ -1,2 +0,0 @@
-local5.=notice					-/var/log/smb_audit.log
-local5.*;local5.!=notice			-{ "${messages}" }
--- a/root/etc/e-smith/templates-custom/etc/syslog.conf/local5.notice
+++ b/root/etc/e-smith/templates-custom/etc/syslog.conf/local5.notice
@ -1 +0,0 @@
-# Disable default samba logging, we log into /var/log/smb_audit.log
--- a/root/etc/e-smith/templates/etc/rsyslog.conf/45smbAudit
+++ b/root/etc/e-smith/templates/etc/rsyslog.conf/45smbAudit
@ -0,0 +1,3 @@
+local5.notice						/var/log/smb_audit.log
+local5.notice ~
+
				`@ -1 +0,0 @@`
				`# Disable default samba logging, we log into /var/log/smb_audit.log`