Attachment 230686 Details for Bug 260262 – portrevision 3: adds log rotation

[patch] portrevision 3: adds log rotation

0002-security-crowdsec-v1.2.2_3-security-crowsec-firewall.patch (text/plain), 5.04 KB, created by marco on 2022-01-04 13:37:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marco

Created: 2022-01-04 13:37:51 UTC

Size: 5.04 KB

patch

obsolete

>From 9222a245fa7a40f58f7f2239de94c9575be5ecee Mon Sep 17 00:00:00 2001
>From: Marco Mariani <marco@crowdsec.net>
>Date: Tue, 4 Jan 2022 14:34:21 +0100
>Subject: [PATCH 2/2] security/crowdsec v1.2.2_3;
> security/crowsec-firewall-bouncer v0.0.20_3
>
>---
> security/crowdsec-firewall-bouncer/Makefile              | 8 +++++++-
> .../files/crowdsec-firewall-bouncer.conf-newsyslog       | 2 ++
> security/crowdsec-firewall-bouncer/files/pkg-message.in  | 2 +-
> security/crowdsec-firewall-bouncer/pkg-plist             | 3 +++
> security/crowdsec/Makefile                               | 9 ++++++++-
> security/crowdsec/files/crowdsec.conf-newsyslog          | 3 +++
> security/crowdsec/pkg-plist                              | 2 ++
> 7 files changed, 26 insertions(+), 3 deletions(-)
> create mode 100644 security/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.conf-newsyslog
> create mode 100644 security/crowdsec/files/crowdsec.conf-newsyslog
>
>diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile
>index c6b38b8eaab5..368fb4e28c77 100644
>--- a/security/crowdsec-firewall-bouncer/Makefile
>+++ b/security/crowdsec-firewall-bouncer/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	crowdsec-firewall-bouncer
> PORTVERSION=	0.0.20  # NOTE: change BUILD_VERSION and BUILD_TAG as well
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>@@ -55,4 +55,10 @@ do-install:
> 	${INSTALL_DATA} ${WRKSRC}/config/crowdsec-firewall-bouncer.yaml \
> 		${STAGEDIR}${ETCDIR}/crowdsec-firewall-bouncer.yaml.sample
> 
>+	#
>+	# Log rotation
>+	#
>+
>+	${INSTALL_DATA} ${FILESDIR}/crowdsec-firewall-bouncer.conf-newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/crowdsec-firewall-bouncer.conf.sample
>+
> .include <bsd.port.mk>
>diff --git a/security/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.conf-newsyslog b/security/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.conf-newsyslog
>new file mode 100644
>index 000000000000..b26fae25b5ce
>--- /dev/null
>+++ b/security/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.conf-newsyslog
>@@ -0,0 +1,2 @@
>+# logfilename				[owner:group]	mode	count	size(kb)	when	flags	[/pid_file]			[sig_num]
>+/var/log/crowdsec-firewall-bouncer.log	root:wheel	644  	10	5120		*	JC	/var/run/crowdsec_firewall.pid
>diff --git a/security/crowdsec-firewall-bouncer/files/pkg-message.in b/security/crowdsec-firewall-bouncer/files/pkg-message.in
>index e0dfe74a32ac..8bcdc8d1d9d6 100644
>--- a/security/crowdsec-firewall-bouncer/files/pkg-message.in
>+++ b/security/crowdsec-firewall-bouncer/files/pkg-message.in
>@@ -26,7 +26,7 @@ Then activate the bouncer via sysrc:
> ----------
> # sysrc crowdsec_firewall_enable="YES"
> crowdsec_firewall_enable: NO -> YES
>-# service start crowdsec_firewall
>+# service crowdsec_firewall start
> ----------
> 
> After a few seconds, the bouncer should have created the tables and rules:
>diff --git a/security/crowdsec-firewall-bouncer/pkg-plist b/security/crowdsec-firewall-bouncer/pkg-plist
>index 6a41287c1e57..ecbf8e901981 100644
>--- a/security/crowdsec-firewall-bouncer/pkg-plist
>+++ b/security/crowdsec-firewall-bouncer/pkg-plist
>@@ -1,4 +1,7 @@
> @mode 0755
> bin/crowdsec-firewall-bouncer
>+@dir etc/newsyslog.conf.d
> @mode 0600
> @sample %%ETCDIR%%/crowdsec-firewall-bouncer.yaml.sample
>+@mode 0644
>+@sample etc/newsyslog.conf.d/crowdsec-firewall-bouncer.conf.sample
>diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
>index 56aae708412d..42b8860924eb 100644
>--- a/security/crowdsec/Makefile
>+++ b/security/crowdsec/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	crowdsec
> PORTVERSION=	1.2.2	# NOTE: change BUILD_VERSION and BUILD_TAG as well
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>@@ -119,4 +119,11 @@ do-install:
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}/hub
> 	@${MKDIR} ${STAGEDIR}/var/db/crowdsec/data
> 
>+	#
>+	# Log rotation
>+	#
>+
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${FILESDIR}/crowdsec.conf-newsyslog ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/crowdsec.conf.sample
>+	
> .include <bsd.port.mk>
>diff --git a/security/crowdsec/files/crowdsec.conf-newsyslog b/security/crowdsec/files/crowdsec.conf-newsyslog
>new file mode 100644
>index 000000000000..a32cf4d567d7
>--- /dev/null
>+++ b/security/crowdsec/files/crowdsec.conf-newsyslog
>@@ -0,0 +1,3 @@
>+# logfilename			[owner:group]	mode	count	size(kb)	when	flags	[/pid_file]				[sig_num]
>+/var/log/crowdsec.log		root:wheel	644  	10	5120		*	JC	/var/run/crowdsec.pid
>+/var/log/crowdsec_api.log	root:wheel	644  	10	5120		*	JC	/var/run/crowdsec.pid
>diff --git a/security/crowdsec/pkg-plist b/security/crowdsec/pkg-plist
>index 5a02566e9cf2..66bea9907502 100644
>--- a/security/crowdsec/pkg-plist
>+++ b/security/crowdsec/pkg-plist
>@@ -37,6 +37,7 @@ bin/crowdsec-cli
> %%ETCDIR%%/patterns/smb
> %%ETCDIR%%/patterns/ssh
> %%ETCDIR%%/patterns/tcpdump
>+@sample etc/newsyslog.conf.d/crowdsec.conf.sample
> @mode 0755
> lib/crowdsec/plugins/notification-http
> lib/crowdsec/plugins/notification-slack
>@@ -44,3 +45,4 @@ lib/crowdsec/plugins/notification-splunk
> @dir %%ETCDIR%%/hub
> @dir /var/db/crowdsec/data
> @dir /var/db/crowdsec
>+@dir etc/newsyslog.conf.d
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 260262: 229955 | 230328 | 230596 | 230686 | 230968