From a4265edac47afc88cfc2d7806fad048214e0267d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Nov 2013 10:20:12 -0600 Subject: rsyslog: change rules for .27 mythlogserver. refs #933 #939 --- abs/core/rsyslog/PKGBUILD | 14 ++++---- abs/core/rsyslog/mythtv.conf | 63 ++++++++++++++++++++++++++++++++++++ abs/core/rsyslog/rsyslog.conf.linhes | 15 ++++----- 3 files changed, 76 insertions(+), 16 deletions(-) create mode 100644 abs/core/rsyslog/mythtv.conf diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index 10ff5fa..61e61f0 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -3,7 +3,7 @@ pkgname=rsyslog pkgver=5.8.6 -pkgrel=10 +pkgrel=11 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -21,8 +21,8 @@ groups=('base') options=('strip' 'zipman' '!libtool') #install=('rsyslog.install') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' - 'rsyslog.conf.d' 'rsyslog.conf.linhes' log_care.sh) + 'rsyslog' 'rsyslog.conf.d' 'rsyslog.conf.linhes' 'mythtv.conf' + 'log_care.sh') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -41,14 +41,14 @@ package() { make install DESTDIR=${pkgdir} # Install Daemons and Configuration Files install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d - install -D -m644 $srcdir/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf - mkdir -p ${pkgdir}/etc/rsyslog.d/ - touch ${pkgdir}/etc/rsyslog.d/empty.conf + install -D -m644 ${srcdir}/${pkgname}.conf.linhes ${pkgdir}/etc/${pkgname}.conf + install -D -m644 ${srcdir}/mythtv.conf ${pkgdir}/etc/rsyslog.d/mythtv.conf install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} install -D -m755 ${srcdir}/log_care.sh ${pkgdir}/etc/cron.daily/log_care } md5sums=('c46db0496066b82faf735bd4222208d7' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '1a0cd4530dd5d1439456d5ae230574d9' - 'df5cb090691db8640c489981ba3d0798' + 'a4dd3846116b02f35d48c8987b30394b' + 'c71fa75857ff7b9e24e41457e89c76ca' 'cd39e6edc1fcbbae2093c40c880e0079') diff --git a/abs/core/rsyslog/mythtv.conf b/abs/core/rsyslog/mythtv.conf new file mode 100644 index 0000000..1878b74 --- /dev/null +++ b/abs/core/rsyslog/mythtv.conf @@ -0,0 +1,63 @@ +# MythTV 0.26 and later rsyslog.d conf + +# Control-code conversion. The default is on. +#$EscapeControlCharactersOnReceive off + +$template DynMythFormat,"%TIMESTAMP:::date-rfc3339%%msg%\n" +$template DynMythBackend,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythbackend.log" +$template DynMythFrontend,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythfrontend.log" +$template DynMythJobQueue,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythjobqueue.log" +$template DynMythMediaServer,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythmediaserver.log" +$template DynMythSetup,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythtv_setup.log" +$template DynMythFillDatabase,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythfilldatabase.log" +$template DynMythCommflag,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythcommflag.log" +$template DynMythPreviewGen,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythpreviewgen.log" +$template DynMythTranscode,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythtranscode.log" +$template DynMythMetadataLookup,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythmetadatalookup.log" +$template DynMythUtil,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythutil.log" +$template DynMythWelcome,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythwelcome.log" +$template DynMythShutdown,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythshutdown.log" +$template DynMythLCDServer,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythlcdserver.log" +$template DynMythccExtractor,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythccextractor.log" +$template DynMythAVTest,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythavtest.log" +$template DynMythLogServer,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_mythlogserver.log" +$template DynMythNoLogServer,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_%programname%.log" + + + +if $syslogfacility-text == 'local6' and $msg startswith ' mythbackend' then ?DynMythBackend;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythfrontend' then ?DynMythFrontend;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythjobqueue' then ?DynMythJobQueue;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythmediaserver' then ?DynMythMediaServer;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythtv-setup' then ?DynMythSetup;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythfilldatabase' then ?DynMythFillDatabase;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythcommflag' then ?DynMythCommflag;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythpreviewgen' then ?DynMythPreviewGen;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythtranscode' then ?DynMythTranscode;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythmetadatalookup' then ?DynMythMetadataLookup;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythutil' then ?DynMythUtil;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythwelcome' then ?DynMythWelcome;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythshutdown' then ?DynMythShutdown;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythlcdserver' then ?DynMythLCDServer;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythccextractor' then ?DynMythccExtractor;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythavtest' then ?DynMythAVTest;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $msg startswith ' mythlogserver' then ?DynMythLogServer;DynMythFormat +& ~ +if $syslogfacility-text == 'local6' and $programname startswith 'myth' then ?DynMythNoLogServer +& ~ diff --git a/abs/core/rsyslog/rsyslog.conf.linhes b/abs/core/rsyslog/rsyslog.conf.linhes index 24bf3f5..ecdc1f4 100644 --- a/abs/core/rsyslog/rsyslog.conf.linhes +++ b/abs/core/rsyslog/rsyslog.conf.linhes @@ -14,20 +14,18 @@ $DirCreateMode 0755 # Log all kernel messages to the console. # Logging much else clutters up the screen. #kern.* /dev/console -$template DailyPerHostLogs,"/var/log//%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_messages.log" +$template DailyPerHostLogs,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_messages.log" $template DynFile,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_%programname%.log" -$template DynMail,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_maillog" -$template DynCron,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_cron" +$template DynMail,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_maillog.log" +$template DynCron,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_cron.log" $template DynBoot,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_boot.log" -$template DynSpooler,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_spooler" -$template DynLighttpd,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_lighttpd" -$template DynMyth,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_%programname%.%syslogtag:R,ERE,1,ZERO:\[([[:digit:]]{1,})\]--end%.log" +$template DynSpooler,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_spooler.log" +$template DynLighttpd,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_lighttpd.log" + if $programname contains 'lighttpd' then ?DynLighttpd & ~ -local6.* ?DynMyth -#& ~ # Log anything (except mail) of level info or higher. # Don't log private authentication messages! #*.info;mail.none;authpriv.none;cron.none -/var/log/messages @@ -42,7 +40,6 @@ authpriv.* ?DynFile #mail.* -/var/log/maillog mail.* ?DynMail - # Log cron stuff #cron.* -/var/log/cron cron.* ?DynCron -- cgit v0.12