From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 16 Dec 2021 22:24:38 +0000 (-0600)
Subject: rule-path: always use $localstatedir/lib/suricata/rules
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d7a497cc168cf3917c1fd7b68daf0fb27e22722;p=people%2Fms%2Fsuricata.git

rule-path: always use $localstatedir/lib/suricata/rules

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.
---

diff --git a/configure.ac b/configure.ac
index 46a498272..462bff447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1431,7 +1431,6 @@
 
     # 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
@@ -1453,7 +1452,6 @@
             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")