From bdb8b3aa1b6cb81fe911cc160b000b694a0bee75 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Tue, 8 Dec 2009 05:11:46 +0000 Subject: Syslog-ng.conf file fixes. PR: 141255 Submitted by: Benjamin Lee --- sysutils/syslog-ng-devel/Makefile | 5 ++--- sysutils/syslog-ng-devel/files/pkg-message.in | 2 +- sysutils/syslog-ng-devel/files/syslog-ng.conf.sample | 6 ++++-- sysutils/syslog-ng-devel/pkg-plist | 3 +-- sysutils/syslog-ng3-devel/Makefile | 5 ++--- sysutils/syslog-ng3-devel/files/pkg-message.in | 2 +- sysutils/syslog-ng3-devel/files/syslog-ng.conf.sample | 6 ++++-- sysutils/syslog-ng3-devel/pkg-plist | 3 +-- sysutils/syslog-ng3/Makefile | 5 ++--- sysutils/syslog-ng3/files/pkg-message.in | 2 +- sysutils/syslog-ng3/files/syslog-ng.conf.sample | 6 ++++-- sysutils/syslog-ng3/pkg-plist | 3 +-- 12 files changed, 24 insertions(+), 24 deletions(-) (limited to 'sysutils') diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index 03b72cb5b939..023047f6e978 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -64,9 +64,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng .endif - @if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \ - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \ + @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \ + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \ fi @${CAT} ${PKGMESSAGE} diff --git a/sysutils/syslog-ng-devel/files/pkg-message.in b/sysutils/syslog-ng-devel/files/pkg-message.in index 3a30820d764f..5901623ad1d1 100644 --- a/sysutils/syslog-ng-devel/files/pkg-message.in +++ b/sysutils/syslog-ng-devel/files/pkg-message.in @@ -4,7 +4,7 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd 1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc/syslog-ng). Note that this is a change in 2.0.2 + %%PREFIX%%/etc). Note that this is a change in 2.0.2 version, previous ones put the config file in %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update move that file in the right place diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample index c2059c4165db..0ba913185c6c 100644 --- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample @@ -1,3 +1,5 @@ +@version:3.0 + # # This sample configuration file is essentially equilivent to the stock # FreeBSD /etc/syslog.conf file. @@ -6,7 +8,7 @@ # # options # -options { long_hostnames(off); sync(0); }; +options { long_hostnames(off); flush_lines(0); }; # # sources @@ -43,7 +45,7 @@ destination allusers { usertty("*"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(authpriv); }; filter f_not_authpriv { not facility(authpriv); }; -filter f_console { facility(console); }; +#filter f_console { facility(console); }; filter f_cron { facility(cron); }; filter f_daemon { facility(daemon); }; filter f_ftp { facility(ftp); }; diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist index c60b6b04e8da..7a7e44b6ca6c 100644 --- a/sysutils/syslog-ng-devel/pkg-plist +++ b/sysutils/syslog-ng-devel/pkg-plist @@ -1,5 +1,5 @@ @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true -etc/syslog-ng/syslog-ng.conf.sample +etc/syslog-ng.conf.sample bin/loggen sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -9,4 +9,3 @@ sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/syslog-ng diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile index 03b72cb5b939..023047f6e978 100644 --- a/sysutils/syslog-ng3-devel/Makefile +++ b/sysutils/syslog-ng3-devel/Makefile @@ -64,9 +64,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng .endif - @if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \ - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \ + @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \ + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \ fi @${CAT} ${PKGMESSAGE} diff --git a/sysutils/syslog-ng3-devel/files/pkg-message.in b/sysutils/syslog-ng3-devel/files/pkg-message.in index 3a30820d764f..5901623ad1d1 100644 --- a/sysutils/syslog-ng3-devel/files/pkg-message.in +++ b/sysutils/syslog-ng3-devel/files/pkg-message.in @@ -4,7 +4,7 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd 1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc/syslog-ng). Note that this is a change in 2.0.2 + %%PREFIX%%/etc). Note that this is a change in 2.0.2 version, previous ones put the config file in %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update move that file in the right place diff --git a/sysutils/syslog-ng3-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng3-devel/files/syslog-ng.conf.sample index c2059c4165db..0ba913185c6c 100644 --- a/sysutils/syslog-ng3-devel/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng3-devel/files/syslog-ng.conf.sample @@ -1,3 +1,5 @@ +@version:3.0 + # # This sample configuration file is essentially equilivent to the stock # FreeBSD /etc/syslog.conf file. @@ -6,7 +8,7 @@ # # options # -options { long_hostnames(off); sync(0); }; +options { long_hostnames(off); flush_lines(0); }; # # sources @@ -43,7 +45,7 @@ destination allusers { usertty("*"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(authpriv); }; filter f_not_authpriv { not facility(authpriv); }; -filter f_console { facility(console); }; +#filter f_console { facility(console); }; filter f_cron { facility(cron); }; filter f_daemon { facility(daemon); }; filter f_ftp { facility(ftp); }; diff --git a/sysutils/syslog-ng3-devel/pkg-plist b/sysutils/syslog-ng3-devel/pkg-plist index c60b6b04e8da..7a7e44b6ca6c 100644 --- a/sysutils/syslog-ng3-devel/pkg-plist +++ b/sysutils/syslog-ng3-devel/pkg-plist @@ -1,5 +1,5 @@ @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true -etc/syslog-ng/syslog-ng.conf.sample +etc/syslog-ng.conf.sample bin/loggen sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -9,4 +9,3 @@ sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/syslog-ng diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile index 03b72cb5b939..023047f6e978 100644 --- a/sysutils/syslog-ng3/Makefile +++ b/sysutils/syslog-ng3/Makefile @@ -64,9 +64,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng .endif - @if [ ! -f ${PREFIX}/etc/syslog-ng/syslog-ng.conf.sample ]; then \ - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/etc/syslog-ng; \ - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng; \ + @if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \ + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \ fi @${CAT} ${PKGMESSAGE} diff --git a/sysutils/syslog-ng3/files/pkg-message.in b/sysutils/syslog-ng3/files/pkg-message.in index 3a30820d764f..5901623ad1d1 100644 --- a/sysutils/syslog-ng3/files/pkg-message.in +++ b/sysutils/syslog-ng3/files/pkg-message.in @@ -4,7 +4,7 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd 1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf (a sample named syslog-ng.conf.sample has been included in - %%PREFIX%%/etc/syslog-ng). Note that this is a change in 2.0.2 + %%PREFIX%%/etc). Note that this is a change in 2.0.2 version, previous ones put the config file in %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update move that file in the right place diff --git a/sysutils/syslog-ng3/files/syslog-ng.conf.sample b/sysutils/syslog-ng3/files/syslog-ng.conf.sample index c2059c4165db..0ba913185c6c 100644 --- a/sysutils/syslog-ng3/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng3/files/syslog-ng.conf.sample @@ -1,3 +1,5 @@ +@version:3.0 + # # This sample configuration file is essentially equilivent to the stock # FreeBSD /etc/syslog.conf file. @@ -6,7 +8,7 @@ # # options # -options { long_hostnames(off); sync(0); }; +options { long_hostnames(off); flush_lines(0); }; # # sources @@ -43,7 +45,7 @@ destination allusers { usertty("*"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(authpriv); }; filter f_not_authpriv { not facility(authpriv); }; -filter f_console { facility(console); }; +#filter f_console { facility(console); }; filter f_cron { facility(cron); }; filter f_daemon { facility(daemon); }; filter f_ftp { facility(ftp); }; diff --git a/sysutils/syslog-ng3/pkg-plist b/sysutils/syslog-ng3/pkg-plist index c60b6b04e8da..7a7e44b6ca6c 100644 --- a/sysutils/syslog-ng3/pkg-plist +++ b/sysutils/syslog-ng3/pkg-plist @@ -1,5 +1,5 @@ @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true -etc/syslog-ng/syslog-ng.conf.sample +etc/syslog-ng.conf.sample bin/loggen sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -9,4 +9,3 @@ sbin/syslog-ng %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/syslog-ng -- cgit v1.2.3