rules: remove configuration for legacy rule handling

Removes the autoconf, and suricata.yaml sections for using
the legacy style of rule management.

diff --git a/configure.ac b/configure.ac
index 691d4c28b220809bc289a891f1333310e02b1e94..82f5252300b1d8395d1f57070f138a0ea06847e6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1549,9 +1549,6 @@
     # Assume suircata-update will not be installed.
     have_suricata_update="no"
     ruledirprefix="$sysconfdir"
-    no_suricata_update_comment="#"
-    has_suricata_update_comment=""
-    suricata_update_rule_files="suricata-update-rule-files"
 
     if test "$enable_suricata_update" = "yes"; then
       AC_CHECK_FILE([$srcdir/suricata-update/setup.py], [
@@ -1576,8 +1573,6 @@
             AC_CONFIG_FILES(suricata-update/Makefile)
             AC_OUTPUT
             ruledirprefix="$localstatedir/lib"
-            no_suricata_update_comment=""
-            has_suricata_update_comment="#"
        fi
     fi
 
@@ -2508,7 +2503,6 @@ if test "$WINDOWS_PATH" = "yes"; then
     esac
 
     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"
@@ -2529,7 +2523,6 @@ else
     EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")
     EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")
     EXPAND_VARIABLE(sysconfdir, e_sysconfdir, "/suricata/")
-    EXPAND_VARIABLE(sysconfdir, e_sysconfrulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/suricata")
     EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_datadir, "/lib/suricata/data")
@@ -2544,7 +2537,6 @@ AC_SUBST(e_logfilesdir)
 AC_SUBST(e_logcertsdir)
 AC_SUBST(e_sysconfdir)
 AC_DEFINE_UNQUOTED([CONFIG_DIR],["$e_sysconfdir"],[Our CONFIG_DIR])
-AC_SUBST(e_sysconfrulesdir)
 AC_SUBST(e_localstatedir)
 AC_DEFINE_UNQUOTED([DATA_DIR],["$e_datadir"],[Our DATA_DIR])
 AC_SUBST(e_magic_file)
@@ -2553,8 +2545,6 @@ AC_SUBST(e_enable_evelog)
 AC_SUBST(e_datarulesdir)
 AC_SUBST(e_defaultruledir)
 AC_SUBST(e_rustdir)
-AC_SUBST(has_suricata_update_comment)
-AC_SUBST(no_suricata_update_comment)
 
 EXPAND_VARIABLE(prefix, CONFIGURE_PREFIX)
 EXPAND_VARIABLE(sysconfdir, CONFIGURE_SYSCONDIR)

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 7cb4d74353d98051d61741987029933e80c58d16..a8284a2884edfabbecefd03457b1cfc37845d4f5 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1857,78 +1857,10 @@ napatech:
 ## file configuration".
 ##
 
-@no_suricata_update_comment@default-rule-path: @e_defaultruledir@
-@no_suricata_update_comment@rule-files:
-@no_suricata_update_comment@ - suricata.rules
+default-rule-path: @e_defaultruledir@
 
-##
-## Advanced rule file configuration.
-##
-## If this section is completely commented out then your configuration
-## is setup for suricata-update as it was most likely bundled and
-## installed with Suricata.
-##
-
-@has_suricata_update_comment@default-rule-path: @e_defaultruledir@
-
-@has_suricata_update_comment@rule-files:
-@has_suricata_update_comment@ - botcc.rules
-@has_suricata_update_comment@ # - botcc.portgrouped.rules
-@has_suricata_update_comment@ - ciarmy.rules
-@has_suricata_update_comment@ - compromised.rules
-@has_suricata_update_comment@ - drop.rules
-@has_suricata_update_comment@ - dshield.rules
-@has_suricata_update_comment@# - emerging-activex.rules
-@has_suricata_update_comment@ - emerging-attack_response.rules
-@has_suricata_update_comment@ - emerging-chat.rules
-@has_suricata_update_comment@ - emerging-current_events.rules
-@has_suricata_update_comment@ - emerging-dns.rules
-@has_suricata_update_comment@ - emerging-dos.rules
-@has_suricata_update_comment@ - emerging-exploit.rules
-@has_suricata_update_comment@ - emerging-ftp.rules
-@has_suricata_update_comment@# - emerging-games.rules
-@has_suricata_update_comment@# - emerging-icmp_info.rules
-@has_suricata_update_comment@# - emerging-icmp.rules
-@has_suricata_update_comment@ - emerging-imap.rules
-@has_suricata_update_comment@# - emerging-inappropriate.rules
-@has_suricata_update_comment@# - emerging-info.rules
-@has_suricata_update_comment@ - emerging-malware.rules
-@has_suricata_update_comment@ - emerging-misc.rules
-@has_suricata_update_comment@ - emerging-mobile_malware.rules
-@has_suricata_update_comment@ - emerging-netbios.rules
-@has_suricata_update_comment@ - emerging-p2p.rules
-@has_suricata_update_comment@ - emerging-policy.rules
-@has_suricata_update_comment@ - emerging-pop3.rules
-@has_suricata_update_comment@ - emerging-rpc.rules
-@has_suricata_update_comment@# - emerging-scada.rules
-@has_suricata_update_comment@# - emerging-scada_special.rules
-@has_suricata_update_comment@ - emerging-scan.rules
-@has_suricata_update_comment@# - emerging-shellcode.rules
-@has_suricata_update_comment@ - emerging-smtp.rules
-@has_suricata_update_comment@ - emerging-snmp.rules
-@has_suricata_update_comment@ - emerging-sql.rules
-@has_suricata_update_comment@ - emerging-telnet.rules
-@has_suricata_update_comment@ - emerging-tftp.rules
-@has_suricata_update_comment@ - emerging-trojan.rules
-@has_suricata_update_comment@ - emerging-user_agents.rules
-@has_suricata_update_comment@ - emerging-voip.rules
-@has_suricata_update_comment@ - emerging-web_client.rules
-@has_suricata_update_comment@ - emerging-web_server.rules
-@has_suricata_update_comment@# - emerging-web_specific_apps.rules
-@has_suricata_update_comment@ - emerging-worm.rules
-@has_suricata_update_comment@ - tor.rules
-@has_suricata_update_comment@# - decoder-events.rules # available in suricata sources under rules dir
-@has_suricata_update_comment@# - stream-events.rules  # available in suricata sources under rules dir
-@has_suricata_update_comment@ - http-events.rules    # available in suricata sources under rules dir
-@has_suricata_update_comment@ - smtp-events.rules    # available in suricata sources under rules dir
-@has_suricata_update_comment@ - dns-events.rules     # available in suricata sources under rules dir
-@has_suricata_update_comment@ - tls-events.rules     # available in suricata sources under rules dir
-@has_suricata_update_comment@# - modbus-events.rules  # available in suricata sources under rules dir
-@has_suricata_update_comment@# - app-layer-events.rules  # available in suricata sources under rules dir
-@has_suricata_update_comment@# - dnp3-events.rules       # available in suricata sources under rules dir
-@has_suricata_update_comment@# - ntp-events.rules       # available in suricata sources under rules dir
-@has_suricata_update_comment@# - ipsec-events.rules       # available in suricata sources under rules dir
-@has_suricata_update_comment@# - kerberos-events.rules       # available in suricata sources under rules dir
+rule-files:
+  - suricata.rules
 
 ##
 ## Auxiliary configuration files.