Merge pull request #683 from yarikoptic/fix/682

Fix typos referencing  paths-common, provide empty defaults for syslog_ log files (Partial fix to #682)
pull/697/head
Steven Hiscocks 2014-04-15 17:14:28 +01:00
commit d4427e5a76
3 changed files with 10 additions and 5 deletions

View File

@ -7,12 +7,17 @@ after = paths-overrides.local
[DEFAULT]
sshd_log = %(syslog_authpriv)s
dropbear_log = %(syslog_authpriv)s
# There is no sensible generic defaults for syslog log targets, thus
# leaving them empty here so that no errors while parsing/interpollatin configs
syslog_daemon =
syslog_ftp =
syslog_local0 =
syslog_mail_warn =
syslog_user =
# from /etc/audit/auditd.conf
auditd_log = /var/log/audit/audit.log
@ -31,7 +36,7 @@ lighttpd_error_log = /var/log/lighttpd/error.log
suhosin_log = %(syslog_user)s %(lighttpd_error_log)s
# defaults to ftp or local2 if ftp doesn't exist
proftpd_log = %(syslog_ftp)s
proftpd_log = %(syslog_ftp)s
# http://svnweb.freebsd.org/ports/head/ftp/proftpd/files/patch-src_proftpd.8.in?view=markup
# defaults to ftp but can be overwritten.

View File

@ -2,7 +2,7 @@
[INCLUDES]
before = common-paths.conf
before = paths-common.conf
after = paths-overrides.local

View File

@ -3,7 +3,7 @@
[INCLUDES]
before = common-paths.conf
before = paths-common.conf
after = paths-overrides.local