diff options
| -rw-r--r-- | config/paths-common.conf | 33 | ||||
| -rw-r--r-- | config/paths-debian.conf | 11 | ||||
| -rw-r--r-- | config/paths-fedora.conf | 9 | ||||
| -rw-r--r-- | config/paths-freebsd.conf | 9 | ||||
| -rw-r--r-- | config/paths-opensuse.conf | 12 | ||||
| -rw-r--r-- | config/paths-osx.conf | 8 |
6 files changed, 28 insertions, 54 deletions
diff --git a/config/paths-common.conf b/config/paths-common.conf index 51323d6b..7383cafe 100644 --- a/config/paths-common.conf +++ b/config/paths-common.conf @@ -9,21 +9,36 @@ after = paths-overrides.local default_backend = %(default/backend)s +# Initial common values (to overwrite in path-<distribution>.conf)... +# There is no sensible generic defaults for syslog log targets, thus +# leaving them empty here (resp. set to mostly used variant) in order +# to avoid errors while parsing/interpolating configs. +# +# Note systemd-backend does not need the logpath at all. +# +syslog_local0 = /var/log/messages + +syslog_authpriv = /var/log/auth.log +syslog_daemon = %(syslog_local0)s +syslog_ftp = %(syslog_local0)s +syslog_mail = +syslog_mail_warn = +syslog_user = %(syslog_local0)s + +# Set the default syslog backend target to default_backend +syslog_backend = %(default_backend)s + +# Default values for several jails: + sshd_log = %(syslog_authpriv)s sshd_backend = %(default_backend)s dropbear_log = %(syslog_authpriv)s dropbear_backend = %(default_backend)s -# There is no sensible generic defaults for syslog log targets, thus -# leaving them empty here so that no errors while parsing/interpolating configs -syslog_daemon = -syslog_ftp = -syslog_local0 = -syslog_mail_warn = -syslog_user = -# Set the default syslog backend target to default_backend -syslog_backend = %(default_backend)s +apache_error_log = /var/log/apache2/*error.log + +apache_access_log = /var/log/apache2/*access.log # from /etc/audit/auditd.conf auditd_log = /var/log/audit/audit.log diff --git a/config/paths-debian.conf b/config/paths-debian.conf index 1ca4d242..e096f972 100644 --- a/config/paths-debian.conf +++ b/config/paths-debian.conf @@ -15,23 +15,12 @@ syslog_mail = /var/log/mail.log # syslog_mail_warn = /var/log/mail.warn syslog_mail_warn = %(syslog_mail)s -syslog_authpriv = /var/log/auth.log - -# syslog_auth = /var/log/auth.log -# syslog_user = /var/log/user.log syslog_ftp = /var/log/syslog syslog_daemon = /var/log/daemon.log -syslog_local0 = /var/log/messages - - -apache_error_log = /var/log/apache2/*error.log - -apache_access_log = /var/log/apache2/*access.log - exim_main_log = /var/log/exim4/mainlog # was in debian squeezy but not in wheezy diff --git a/config/paths-fedora.conf b/config/paths-fedora.conf index d13645b1..3d637e1f 100644 --- a/config/paths-fedora.conf +++ b/config/paths-fedora.conf @@ -15,15 +15,6 @@ syslog_mail_warn = /var/log/maillog syslog_authpriv = /var/log/secure -syslog_user = /var/log/messages - -syslog_ftp = /var/log/messages - -syslog_daemon = /var/log/messages - -syslog_local0 = /var/log/messages - - apache_error_log = /var/log/httpd/*error_log apache_access_log = /var/log/httpd/*access_log diff --git a/config/paths-freebsd.conf b/config/paths-freebsd.conf index 91b23636..550ee887 100644 --- a/config/paths-freebsd.conf +++ b/config/paths-freebsd.conf @@ -15,19 +15,10 @@ syslog_mail = /var/log/maillog syslog_mail_warn = /var/log/maillog -syslog_authpriv = /var/log/auth.log - # note - is only ftp.info - if notice /var/log/messages may be needed syslog_ftp = /var/log/xferlog -syslog_daemon = /var/log/messages - -syslog_local0 = /var/log/messages - # Linux things -# we fake to avoid parse error in startups - -auditd_log = /dev/null # http://svnweb.freebsd.org/ports/head/www/apache24/files/patch-docs__conf__extra__httpd-ssl.conf.in?view=markup # http://svnweb.freebsd.org/ports/head/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in?view=markup diff --git a/config/paths-opensuse.conf b/config/paths-opensuse.conf index 227a5e98..f1d70ce7 100644 --- a/config/paths-opensuse.conf +++ b/config/paths-opensuse.conf @@ -9,24 +9,12 @@ after = paths-overrides.local [DEFAULT] -syslog_local0 = /var/log/messages - syslog_mail = /var/log/mail syslog_mail_warn = %(syslog_mail)s syslog_authpriv = %(syslog_local0)s -syslog_user = %(syslog_local0)s - -syslog_ftp = %(syslog_local0)s - -syslog_daemon = %(syslog_local0)s - -apache_error_log = /var/log/apache2/*error_log - -apache_access_log = /var/log/apache2/*access_log - pureftpd_log = %(syslog_local0)s exim_main_log = /var/log/exim/main.log diff --git a/config/paths-osx.conf b/config/paths-osx.conf index d1b99b38..2fffd65a 100644 --- a/config/paths-osx.conf +++ b/config/paths-osx.conf @@ -17,11 +17,11 @@ syslog_mail_warn = /var/log/mail.warn syslog_authpriv = /var/log/secure.log #syslog_auth = -#syslog_user = +syslog_user = -#syslog_ftp = +syslog_ftp = -#syslog_daemon = +syslog_daemon = -#syslog_local0 = +syslog_local0 = |