rules: set default rule dir to suricata-update if bundled

If suricata-update is bundled, set the default-rule-dir
to lib/suricata/rules under the $localstatedir

For now use 2 rule-files section that are renamed depending
on if suricata-update is bundled or not.

diff --git a/configure.ac b/configure.ac
index 0b0ff7a41b4ff6a245164bc4f30a55b44d64959f..87cd6c0476a10d09fc73ca132bbbb325d6365a6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1377,11 +1377,17 @@
 
   # suricata-update
   have_suricata_update="no"
+  ruledirprefix="$sysconfdir"
+  suricata_update_rule_files="suricata-update-rule-files"
+  classic_rule_files="rule-files"
   AC_CHECK_FILE([$srcdir/suricata-update/setup.py], [
       SURICATA_UPDATE_DIR="suricata-update"
       AC_SUBST(SURICATA_UPDATE_DIR)
       AC_OUTPUT(suricata-update/Makefile)
       have_suricata_update="yes"
+      ruledirprefix="$localstatedir/lib"
+      suricata_update_rule_files="rule-files"
+      classic_rule_files="classic-rule-files"
   ])
   AM_CONDITIONAL([HAVE_SURICATA_UPDATE], [test "x$have_suricata_update" != "xno"])
 
@@ -2233,6 +2239,7 @@ if test "$WINDOWS_PATH" = "yes"; then
 
     e_sysconfdir="${e_winbase}\\\\"
     e_sysconfrulesdir="$e_winbase\\\\rules\\\\"
+    e_defaultruledir="$e_winbase\\\\rules\\\\"
     e_magic_file="$e_winbase\\\\magic.mgc"
     e_logdir="$e_winbase\\\\log"
     e_logfilesdir="$e_logdir\\\\files"
@@ -2247,6 +2254,7 @@ else
     EXPAND_VARIABLE(sysconfdir, e_sysconfrulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
     EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
+    EXPAND_VARIABLE(ruledirprefix, e_defaultruledir, "/suricata/rules")
 fi
 AC_SUBST(e_logdir)
 AC_SUBST(e_rundir)
@@ -2260,6 +2268,9 @@ AC_SUBST(e_magic_file)
 AC_SUBST(e_magic_file_comment)
 AC_SUBST(e_enable_evelog)
 AC_SUBST(e_datarulesdir)
+AC_SUBST(e_defaultruledir)
+AC_SUBST(suricata_update_rule_files)
+AC_SUBST(classic_rule_files)
 
 EXPAND_VARIABLE(prefix, CONFIGURE_PREFIX)
 EXPAND_VARIABLE(sysconfdir, CONFIGURE_SYSCONDIR)

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 1fe208e2349f1b0e00241acb77e19d6fd096a216..cd4b15c36191bbf0260506250b58eb5388c882d7 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -49,8 +49,11 @@ vars:
 ## Step 2: select the rules to enable or disable
 ##
 
-default-rule-path: @e_sysconfdir@rules
-rule-files:
+#default-rule-path: @e_sysconfdir@rules
+default-rule-path: @e_defaultruledir@
+@suricata_update_rule_files@:
+ - suricata.rules
+@classic_rule_files@:
  - botcc.rules
  # - botcc.portgrouped.rules
  - ciarmy.rules