Gentoo Archives: gentoo-commits

From: Slawek Lis <slis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/files/
Date: Thu, 29 Dec 2016 06:23:48
Message-Id: 1482992613.f3eaaf161bf666f9c10b6e333bfaaf1a55a81a0b.slis@gentoo
1 commit: f3eaaf161bf666f9c10b6e333bfaaf1a55a81a0b
2 Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 06:23:33 2016 +0000
4 Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 06:23:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3eaaf16
7
8 net-analyzer/suricata: fix in init script
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-analyzer/suricata/files/suricata-3.2-init | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/net-analyzer/suricata/files/suricata-3.2-init b/net-analyzer/suricata/files/suricata-3.2-init
16 index b276f49..9ffedf4 100644
17 --- a/net-analyzer/suricata/files/suricata-3.2-init
18 +++ b/net-analyzer/suricata/files/suricata-3.2-init
19 @@ -26,7 +26,7 @@ else
20 fi
21 SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
22 SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
23 -[ -e ${SURICATACONF} ] && SURICATAOPTS="${SURICATAOPTS} -c ${SURICATACONF}"
24 +[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
25
26 description="Suricata IDS/IPS"
27 extra_commands="checkconfig dump"
28 @@ -47,7 +47,7 @@ checkconfig() {
29 checkpath -d /var/run/suricata
30 fi
31 if [ ${#SURICATALOGPATH} -gt 0 ]; then
32 - SURICATALOGFILE=$( basename ${SURICATA_LOG_FILE} )
33 + SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
34 SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
35 SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
36 if [ ! -d "${SURICATALOGPATH}" ] ; then