From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] suricata.yaml: Fix bug13646 - Adjust the include syntax
 to use array format
Date: Tue, 10 Dec 2024 14:18:33 +0000
Message-ID: <4121CC15-CCAF-4831-A190-FE1BEB4684B8@ipfire.org>
In-Reply-To: <20241210132355.3397037-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8875037248089830500=="
List-Id: <development.lists.ipfire.org>

--===============8875037248089830500==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

Looks good for me. Thank you for taking care of this!

> On 10 Dec 2024, at 13:23, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - Suricata-8.x will only accept include statements in array format and not =
in multiple
>   single lines. Suricata-7.x still accepts the multiple single lines but fl=
ags up that
>   the format is deprecated and will be removed in suricata-8.x
> - This patch adjusts the address-groups include into the array format.
> - This change has been tested out on my vm and the IPS started up and from =
the logs you
>   can see that all the include files were taken on board and the derprecati=
on message
>   is no longer shown.
> - This change can be implemented with Suricata-7.x and will make sure that =
IPFire has
>   the include syntax that Suricata-8.x will require.
>=20
> Fixes: Bug13646
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/suricata/suricata.yaml | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
> index faa1aa71d..443b8e19e 100644
> --- a/config/suricata/suricata.yaml
> +++ b/config/suricata/suricata.yaml
> @@ -8,11 +8,11 @@
>=20
> vars:
>   address-groups:
> -    # 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
> +    include:
> +            # Include HOME_NET declaration from external file.
> +            - /var/ipfire/suricata/suricata-homenet.yaml
> +            # Include DNS_SERVERS declaration from external file.
> +            - /var/ipfire/suricata/suricata-dns-servers.yaml
>=20
>     EXTERNAL_NET: "any"
>=20
> --=20
> 2.47.1
>=20


--===============8875037248089830500==--