From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE012139085 for ; Thu, 29 Dec 2016 06:23:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2333921C039; Thu, 29 Dec 2016 06:23:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F22AB21C039 for ; Thu, 29 Dec 2016 06:23:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B23FA341130 for ; Thu, 29 Dec 2016 06:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5402E1F02 for ; Thu, 29 Dec 2016 06:23:45 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1482992613.f3eaaf161bf666f9c10b6e333bfaaf1a55a81a0b.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/suricata/files/suricata-3.2-init X-VCS-Directories: net-analyzer/suricata/files/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: f3eaaf161bf666f9c10b6e333bfaaf1a55a81a0b X-VCS-Branch: master Date: Thu, 29 Dec 2016 06:23:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ca6d6fa-9778-45ee-aa7c-223033758024 X-Archives-Hash: af21f47daec0cbe9aef0ea20350e2255 commit: f3eaaf161bf666f9c10b6e333bfaaf1a55a81a0b Author: Slawomir Lis gentoo org> AuthorDate: Thu Dec 29 06:23:33 2016 +0000 Commit: Slawek Lis gentoo org> CommitDate: Thu Dec 29 06:23:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3eaaf16 net-analyzer/suricata: fix in init script Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-analyzer/suricata/files/suricata-3.2-init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/suricata/files/suricata-3.2-init b/net-analyzer/suricata/files/suricata-3.2-init index b276f49..9ffedf4 100644 --- a/net-analyzer/suricata/files/suricata-3.2-init +++ b/net-analyzer/suricata/files/suricata-3.2-init @@ -26,7 +26,7 @@ else fi SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}} SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}} -[ -e ${SURICATACONF} ] && SURICATAOPTS="${SURICATAOPTS} -c ${SURICATACONF}" +[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}" description="Suricata IDS/IPS" extra_commands="checkconfig dump" @@ -47,7 +47,7 @@ checkconfig() { checkpath -d /var/run/suricata fi if [ ${#SURICATALOGPATH} -gt 0 ]; then - SURICATALOGFILE=$( basename ${SURICATA_LOG_FILE} ) + SURICATALOGFILE=$( basename ${SURICATALOGPATH} ) SURICATALOGFILE=${SURICATALOGFILE:-suricata.log} SURICATALOGPATH=$( dirname ${SURICATALOGPATH} ) if [ ! -d "${SURICATALOGPATH}" ] ; then