diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
commit | e4421c38da95569f796d29c83a54f750e5222545 (patch) | |
tree | 3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 /community/rsyslog | |
parent | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff) | |
parent | 0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libgdamm/PKGBUILD
community/luasql/PKGBUILD
community/myodbc/PKGBUILD
community/python2-basemap/PKGBUILD
community/ruby-cairo/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/stardict/PKGBUILD
core/diffutils/PKGBUILD
core/libsasl/PKGBUILD
core/systemd/PKGBUILD
extra/anjuta/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnokii/PKGBUILD
extra/icu/PKGBUILD
extra/libgda/PKGBUILD
extra/libmtp/PKGBUILD
extra/lighttpd/PKGBUILD
extra/mariadb/PKGBUILD
extra/mysql/PKGBUILD
extra/php/PKGBUILD
extra/qt3/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/tracker/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/lilo/PKGBUILD
libre/psi/PKGBUILD
Diffstat (limited to 'community/rsyslog')
-rw-r--r-- | community/rsyslog/PKGBUILD | 15 | ||||
-rw-r--r-- | community/rsyslog/rsyslog.conf | 44 |
2 files changed, 53 insertions, 6 deletions
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index af15f8193..e98bfa2b8 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 86155 2013-03-12 13:29:27Z spupykin $ +# $Id: PKGBUILD 87020 2013-03-25 19:17:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.6 -pkgrel=4 +pkgrel=6 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmysqlclient: MySQL Database Support' + 'libmariadbclient: MySQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' @@ -21,11 +21,13 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d') + 'rsyslog.conf.d' + 'rsyslog.conf') md5sums=('2b2bfbc3f87fe85add651dc07a6f21ea' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e') + '18565f38a4445136446a31a3c95ffc3e' + 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -47,6 +49,7 @@ package() { # Install Daemons and Configuration Files install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example + install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} diff --git a/community/rsyslog/rsyslog.conf b/community/rsyslog/rsyslog.conf new file mode 100644 index 000000000..4416c26d5 --- /dev/null +++ b/community/rsyslog/rsyslog.conf @@ -0,0 +1,44 @@ +# Minimal config + +$ModLoad imuxsock # provides support for local system logging +$ModLoad imklog # provides kernel logging support +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +$FileOwner root +$FileGroup root +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 +$WorkDirectory /var/spool/rsyslog +$IncludeConfig /etc/rsyslog.d/*.conf + +auth,authpriv.* /var/log/auth.log +*.*;auth,authpriv.none -/var/log/syslog +#cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +*.emerg :omusrmsg:* + +daemon.*;mail.*;\ + news.err;\ + *.=debug;*.=info;\ + *.=notice;*.=warn |/dev/xconsole |