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

Ticket #4912.
pull/6809/head
Jason Ish 3 years ago committed by Victor Julien
parent 44c9241b6a
commit 9d7a497cc1

@ -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")

Loading…
Cancel
Save