From patchwork Tue Nov 5 09:32:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2577 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 476kvx3Fv8z43Tf for ; Tue, 5 Nov 2019 09:32:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 476kvv4jYtz6Cy; Tue, 5 Nov 2019 09:32:11 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 476kvv2TVPz2yqy; Tue, 5 Nov 2019 09:32:11 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 476kvt1gsYz2xZd for ; Tue, 5 Nov 2019 09:32:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 476kvs4Jj6z639; Tue, 5 Nov 2019 09:32:09 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1572946329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OuZUDGgEMTPp5dRwBIQfKwIEOqAX+j0zVtk6FgoPVrI=; b=GtlIR3y0wuXHQxUMwFe3+JwCU0RBL9F15yU0jaT8ZzGvryTN8kL0SyFX6RZF8eR4kwxwUd f+Hq06+rRTsIWaDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1572946329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OuZUDGgEMTPp5dRwBIQfKwIEOqAX+j0zVtk6FgoPVrI=; b=h0WWt5BUbeaTgvhzhzGWa5MEmGK7thjfDGe3GSB6vYLnY8ny7BPzUar4oZkTx1LMeVlQ4/ f3Ez12RVrpDQ1W+JBX0uTNmuuot9daF+R0Ezjnd4BhH0jC8LjpCjcWaoV0+pyn/+JrymlY OdQtGweXld7In8ShxxMDo9V3ie2xpYQ0qBCWHg1krABfPdgOBa0yQUBpBIGNg+MVpFciKi YM2MOZsqwUrr/WQZuoMBrUTmMHg5eLn36Jyr+BFSqFVG6LvQzTmC6p6mjAuamg1+SVLhlz t8m+q3sr/l2113PDY/NDC47eSN8pbfoEUiFg062Pj7aiBaztomLeBonb6Jp8RA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 5/5] suricata: Use DNS_SERVERS declaration from external file. Date: Tue, 5 Nov 2019 10:32:02 +0100 Message-Id: <20191105093202.4488-5-stefan.schantl@ipfire.org> In-Reply-To: <20191105093202.4488-1-stefan.schantl@ipfire.org> References: <20191105093202.4488-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" These settings now will be read from /var/ipfire/suricata/suricata-dns-servers.yaml, which will be generated by the generate_dns_servers_file() function, located in ids-functions.pl and called by various scripts. Fixes #12166. Signed-off-by: Stefan Schantl --- config/suricata/suricata.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml index e921781cf..af9cb75a9 100644 --- a/config/suricata/suricata.yaml +++ b/config/suricata/suricata.yaml @@ -11,12 +11,14 @@ vars: # Include HOME_NET declaration from external file. include: /var/ipfire/suricata/suricata-homenet.yaml + # Include DNS_SERVERS declaration from external file. + include: /var/ipfire/suricata/suricata-dns-servers.yaml + EXTERNAL_NET: "any" HTTP_SERVERS: "$HOME_NET" SMTP_SERVERS: "$HOME_NET" SQL_SERVERS: "$HOME_NET" - DNS_SERVERS: "$HOME_NET" TELNET_SERVERS: "$HOME_NET" AIM_SERVERS: "$EXTERNAL_NET" DC_SERVERS: "$HOME_NET"