Description: Debianize the upstream Snort configuration file
 Make the paths FHS compliant
 Add in additional rules shipped with the Debian package
Author: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
Origin: vendor
Last-Update: 2011-11-28

--- a/etc/snort.conf
+++ b/etc/snort.conf
@@ -46,6 +46,7 @@
 
 # Set up the external network addresses. Leave as "any" in most situations
 ipvar EXTERNAL_NET any
+#ipvar EXTERNAL_NET !$HOME_NET
 
 # List of DNS servers on your network 
 ipvar DNS_SERVERS $HOME_NET
@@ -101,9 +102,9 @@
 # Path to your rules files (this can be a relative path)
 # Note for Windows users:  You are advised to make this an absolute path,
 # such as:  c:\snort\rules
-var RULE_PATH ../rules
-var SO_RULE_PATH ../so_rules
-var PREPROC_RULE_PATH ../preproc_rules
+var RULE_PATH /etc/snort/rules
+var SO_RULE_PATH /etc/snort/so_rules
+var PREPROC_RULE_PATH /etc/snort/preproc_rules
 
 # If you are using reputation preprocessor set these
 # Currently there is a bug with relative paths, they are relative to where snort is
@@ -244,13 +245,13 @@
 ###################################################
 
 # path to dynamic preprocessor libraries
-dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/
+dynamicpreprocessor directory /usr/lib/snort_dynamicpreprocessor/
 
 # path to base preprocessor engine
-dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so
+dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
 
 # path to dynamic rules libraries
-dynamicdetection directory /usr/local/lib/snort_dynamicrules
+# dynamicdetection directory /usr/lib/snort_dynamicrules
 
 ###################################################
 # Step #5: Configure preprocessors
@@ -527,11 +528,19 @@
 # output alert_syslog: LOG_AUTH LOG_ALERT
 
 # pcap
-# output log_tcpdump: tcpdump.log
+output log_tcpdump: tcpdump.log
 
 # database
 # output database: alert, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname>
 # output database: log, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname>
+# 
+# On Debian Systems, the database configuration is kept in a separate file:
+# /etc/snort/database.conf.
+# This file can be empty, if you are not using any database information
+# If you are using databases, please edit that file instead of this one, to
+# ensure smoother upgrades to future versions of this package.
+include database.conf
+#
 
 # prelude
 # output alert_prelude
@@ -604,6 +613,20 @@
 include $RULE_PATH/web-iis.rules
 include $RULE_PATH/web-misc.rules
 include $RULE_PATH/web-php.rules
+include $RULE_PATH/web-attacks.rules
+include $RULE_PATH/community-sql-injection.rules
+include $RULE_PATH/community-web-client.rules
+include $RULE_PATH/community-web-dos.rules
+include $RULE_PATH/community-web-iis.rules
+include $RULE_PATH/community-web-misc.rules
+include $RULE_PATH/community-web-php.rules
+include $RULE_PATH/web-attacks.rules
+include $RULE_PATH/community-sql-injection.rules
+include $RULE_PATH/community-web-client.rules
+include $RULE_PATH/community-web-dos.rules
+include $RULE_PATH/community-web-iis.rules
+include $RULE_PATH/community-web-misc.rules
+include $RULE_PATH/community-web-php.rules
 include $RULE_PATH/x11.rules
 
 ###################################################
