]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rule-path: always use $localstatedir/lib/suricata/rules
authorJason Ish <jason.ish@oisf.net>
Thu, 16 Dec 2021 22:24:38 +0000 (16:24 -0600)
committerVictor Julien <vjulien@oisf.net>
Tue, 18 Jan 2022 11:21:54 +0000 (12:21 +0100)
Always use the same path for default-rule-path whether or not
Suricata-Update will be installed as part of the Suricata install or
not.

This provides consistency, and maps better to our recommendation that
Suricata-Update be used to manage rules.

Probably should have been done as part of
55852d0de3151517b6cb22c736cb2de8a893cb11.

Ticket #4912.

configure.ac

index 46a4982726a314b864bffc6eaf9fc7883dcf6979..462bff447ac3eb0aa5c39387defd289aaaf09e86 100644 (file)
 
     # Assume suircata-update will not be installed.
     have_suricata_update="no"
-    ruledirprefix="$sysconfdir"
 
     if test "$enable_suricata_update" = "yes"; then
         if test -f "$srcdir/suricata-update/setup.py"; then
             AC_SUBST(SURICATA_UPDATE_DIR)
             AC_CONFIG_FILES(suricata-update/Makefile)
             AC_OUTPUT
-            ruledirprefix="$localstatedir/lib"
        fi
     fi
 
@@ -2513,7 +2511,7 @@ else
     EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
     EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_datadir, "/lib/suricata/data")
-    EXPAND_VARIABLE(ruledirprefix, e_defaultruledir, "/suricata/rules")
+    EXPAND_VARIABLE(localstatedir, e_defaultruledir, "/lib/suricata/rules")
 
     e_abs_srcdir=$(cd $srcdir && pwd)
     EXPAND_VARIABLE(e_abs_srcdir, e_rustdir, "/rust")