[arch-commits] Commit in rsyslog/repos (16 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:37:05 EDT 2013


    Date: Monday, May 13, 2013 @ 16:37:04
  Author: spupykin
Revision: 90719

archrelease: copy trunk to community-i686, community-x86_64

Added:
  rsyslog/repos/community-i686/PKGBUILD
    (from rev 90718, rsyslog/trunk/PKGBUILD)
  rsyslog/repos/community-i686/rsyslog.conf
    (from rev 90718, rsyslog/trunk/rsyslog.conf)
  rsyslog/repos/community-i686/rsyslog.logrotate
    (from rev 90718, rsyslog/trunk/rsyslog.logrotate)
  rsyslog/repos/community-x86_64/PKGBUILD
    (from rev 90718, rsyslog/trunk/PKGBUILD)
  rsyslog/repos/community-x86_64/rsyslog.conf
    (from rev 90718, rsyslog/trunk/rsyslog.conf)
  rsyslog/repos/community-x86_64/rsyslog.logrotate
    (from rev 90718, rsyslog/trunk/rsyslog.logrotate)
Deleted:
  rsyslog/repos/community-i686/PKGBUILD
  rsyslog/repos/community-i686/rsyslog
  rsyslog/repos/community-i686/rsyslog.conf
  rsyslog/repos/community-i686/rsyslog.conf.d
  rsyslog/repos/community-i686/rsyslog.logrotate
  rsyslog/repos/community-x86_64/PKGBUILD
  rsyslog/repos/community-x86_64/rsyslog
  rsyslog/repos/community-x86_64/rsyslog.conf
  rsyslog/repos/community-x86_64/rsyslog.conf.d
  rsyslog/repos/community-x86_64/rsyslog.logrotate

------------------------------------+
 /PKGBUILD                          |  108 +++++++++++++++++++++++++++++++++++
 /rsyslog.conf                      |   88 ++++++++++++++++++++++++++++
 /rsyslog.logrotate                 |   14 ++++
 community-i686/PKGBUILD            |   60 -------------------
 community-i686/rsyslog             |   39 ------------
 community-i686/rsyslog.conf        |   44 --------------
 community-i686/rsyslog.conf.d      |    6 -
 community-i686/rsyslog.logrotate   |    7 --
 community-x86_64/PKGBUILD          |   60 -------------------
 community-x86_64/rsyslog           |   39 ------------
 community-x86_64/rsyslog.conf      |   44 --------------
 community-x86_64/rsyslog.conf.d    |    6 -
 community-x86_64/rsyslog.logrotate |    7 --
 13 files changed, 210 insertions(+), 312 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-i686/PKGBUILD	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=rsyslog
-pkgver=7.2.7
-pkgrel=1
-pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
-url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'libestr' 'libee' 'json-c')
-makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls')
-optdepends=('postgresql-libs: PostgreSQL Database Support'
-	    'libmariadbclient: MySQL Database Support'
-	    'net-snmp'
-	    'gnutls')
-backup=('etc/rsyslog.conf'
-	'etc/logrotate.d/rsyslog'
-	'etc/conf.d/rsyslog')
-options=('strip' 'zipman' '!libtool')
-source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-	'rsyslog'
-	'rsyslog.logrotate'
-	'rsyslog.conf.d'
-	'rsyslog.conf')
-md5sums=('4a61d182acb5b5487e7b99dea8974857'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
-         '18565f38a4445136446a31a3c95ffc3e'
-         'd61dd424e660eb16401121eed20d98bc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --enable-mysql \
-              --enable-pgsql \
-              --enable-mail \
-              --enable-imfile \
-              --enable-snmp \
-              --enable-gnutls \
-              --enable-inet \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install DESTDIR=${pkgdir}
-  # 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}
-
-  # fix location of systemctl and remove start precondition
-  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
-    -e 's@/bin/systemctl@/usr&@' \
-    -e '/^ExecStartPre/d'
-}

Copied: rsyslog/repos/community-i686/PKGBUILD (from rev 90718, rsyslog/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-13 14:37:04 UTC (rev 90719)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=rsyslog
+pkgver=7.2.7
+pkgrel=2
+pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
+url="http://www.rsyslog.com/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('zlib' 'libestr' 'libee' 'json-c')
+makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmariadbclient: MySQL Database Support'
+	    'net-snmp'
+	    'gnutls')
+backup=('etc/rsyslog.conf'
+	'etc/logrotate.d/rsyslog'
+	'etc/conf.d/rsyslog')
+options=('strip' 'zipman' '!libtool')
+source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
+	'rsyslog.logrotate'
+	'rsyslog.conf')
+md5sums=('4a61d182acb5b5487e7b99dea8974857'
+         '8065db4bef3061a4f000ba58779f6829'
+         'd61dd424e660eb16401121eed20d98bc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+              --enable-mysql \
+              --enable-pgsql \
+              --enable-mail \
+              --enable-imfile \
+              --enable-snmp \
+              --enable-gnutls \
+              --enable-inet \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system
+  echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+  # Install Daemons and Configuration Files
+  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}
+
+  # fix location of systemctl and remove start precondition
+  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
+    -e 's@/bin/systemctl@/usr&@' \
+    -e '/^ExecStartPre/d'
+}

Deleted: community-i686/rsyslog
===================================================================
--- community-i686/rsyslog	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-i686/rsyslog	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Deleted: community-i686/rsyslog.conf
===================================================================
--- community-i686/rsyslog.conf	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-i686/rsyslog.conf	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,44 +0,0 @@
-# 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

Copied: rsyslog/repos/community-i686/rsyslog.conf (from rev 90718, rsyslog/trunk/rsyslog.conf)
===================================================================
--- community-i686/rsyslog.conf	                        (rev 0)
+++ community-i686/rsyslog.conf	2013-05-13 14:37:04 UTC (rev 90719)
@@ -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

Deleted: community-i686/rsyslog.conf.d
===================================================================
--- community-i686/rsyslog.conf.d	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-i686/rsyslog.conf.d	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c6"

Deleted: community-i686/rsyslog.logrotate
===================================================================
--- community-i686/rsyslog.logrotate	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-i686/rsyslog.logrotate	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,7 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
-    missingok
-    sharedscripts
-    postrotate
-	/usr/bin/killall -HUP /usr/sbin/rsyslogd
-    endscript
-}

Copied: rsyslog/repos/community-i686/rsyslog.logrotate (from rev 90718, rsyslog/trunk/rsyslog.logrotate)
===================================================================
--- community-i686/rsyslog.logrotate	                        (rev 0)
+++ community-i686/rsyslog.logrotate	2013-05-13 14:37:04 UTC (rev 90719)
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    missingok
+    sharedscripts
+    postrotate
+	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+    endscript
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-x86_64/PKGBUILD	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=rsyslog
-pkgver=7.2.7
-pkgrel=1
-pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
-url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'libestr' 'libee' 'json-c')
-makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls')
-optdepends=('postgresql-libs: PostgreSQL Database Support'
-	    'libmariadbclient: MySQL Database Support'
-	    'net-snmp'
-	    'gnutls')
-backup=('etc/rsyslog.conf'
-	'etc/logrotate.d/rsyslog'
-	'etc/conf.d/rsyslog')
-options=('strip' 'zipman' '!libtool')
-source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-	'rsyslog'
-	'rsyslog.logrotate'
-	'rsyslog.conf.d'
-	'rsyslog.conf')
-md5sums=('4a61d182acb5b5487e7b99dea8974857'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
-         '18565f38a4445136446a31a3c95ffc3e'
-         'd61dd424e660eb16401121eed20d98bc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --enable-mysql \
-              --enable-pgsql \
-              --enable-mail \
-              --enable-imfile \
-              --enable-snmp \
-              --enable-gnutls \
-              --enable-inet \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install DESTDIR=${pkgdir}
-  # 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}
-
-  # fix location of systemctl and remove start precondition
-  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
-    -e 's@/bin/systemctl@/usr&@' \
-    -e '/^ExecStartPre/d'
-}

Copied: rsyslog/repos/community-x86_64/PKGBUILD (from rev 90718, rsyslog/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-13 14:37:04 UTC (rev 90719)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=rsyslog
+pkgver=7.2.7
+pkgrel=2
+pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
+url="http://www.rsyslog.com/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('zlib' 'libestr' 'libee' 'json-c')
+makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmariadbclient: MySQL Database Support'
+	    'net-snmp'
+	    'gnutls')
+backup=('etc/rsyslog.conf'
+	'etc/logrotate.d/rsyslog'
+	'etc/conf.d/rsyslog')
+options=('strip' 'zipman' '!libtool')
+source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
+	'rsyslog.logrotate'
+	'rsyslog.conf')
+md5sums=('4a61d182acb5b5487e7b99dea8974857'
+         '8065db4bef3061a4f000ba58779f6829'
+         'd61dd424e660eb16401121eed20d98bc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+              --enable-mysql \
+              --enable-pgsql \
+              --enable-mail \
+              --enable-imfile \
+              --enable-snmp \
+              --enable-gnutls \
+              --enable-inet \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system
+  echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+  # Install Daemons and Configuration Files
+  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}
+
+  # fix location of systemctl and remove start precondition
+  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
+    -e 's@/bin/systemctl@/usr&@' \
+    -e '/^ExecStartPre/d'
+}

Deleted: community-x86_64/rsyslog
===================================================================
--- community-x86_64/rsyslog	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-x86_64/rsyslog	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Deleted: community-x86_64/rsyslog.conf
===================================================================
--- community-x86_64/rsyslog.conf	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-x86_64/rsyslog.conf	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,44 +0,0 @@
-# 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

Copied: rsyslog/repos/community-x86_64/rsyslog.conf (from rev 90718, rsyslog/trunk/rsyslog.conf)
===================================================================
--- community-x86_64/rsyslog.conf	                        (rev 0)
+++ community-x86_64/rsyslog.conf	2013-05-13 14:37:04 UTC (rev 90719)
@@ -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

Deleted: community-x86_64/rsyslog.conf.d
===================================================================
--- community-x86_64/rsyslog.conf.d	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-x86_64/rsyslog.conf.d	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c6"

Deleted: community-x86_64/rsyslog.logrotate
===================================================================
--- community-x86_64/rsyslog.logrotate	2013-05-13 14:36:41 UTC (rev 90718)
+++ community-x86_64/rsyslog.logrotate	2013-05-13 14:37:04 UTC (rev 90719)
@@ -1,7 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
-    missingok
-    sharedscripts
-    postrotate
-	/usr/bin/killall -HUP /usr/sbin/rsyslogd
-    endscript
-}

Copied: rsyslog/repos/community-x86_64/rsyslog.logrotate (from rev 90718, rsyslog/trunk/rsyslog.logrotate)
===================================================================
--- community-x86_64/rsyslog.logrotate	                        (rev 0)
+++ community-x86_64/rsyslog.logrotate	2013-05-13 14:37:04 UTC (rev 90719)
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    missingok
+    sharedscripts
+    postrotate
+	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+    endscript
+}



More information about the arch-commits mailing list