Merge pull request #16194 from miska/snort3-master

net/snort3: Include default configs and snort2lua

net/snort3/Makefile

@@ -59,6 +59,7 @@ TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/daq3 -ltirpc
 
 define Package/snort3/conffiles
 /etc/config/snort
+/etc/snort/
 endef
 
 define Package/snort3/install
@@ -67,6 +68,10 @@ define Package/snort3/install
 		$(PKG_INSTALL_DIR)/usr/bin/snort  \
 		$(1)/usr/bin/
 
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/snort2lua  \
+		$(1)/usr/bin/
+
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/bin/u2{boat,spewfoo} \
 		$(1)/usr/bin/
@@ -86,6 +91,9 @@ define Package/snort3/install
 		$(1)/usr/share/lua/
 
 	$(INSTALL_DIR) $(1)/etc/snort
+	$(INSTALL_CONF) \
+		$(PKG_INSTALL_DIR)/usr/etc/snort/*.lua \
+		$(1)/etc/snort
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \

net/snort3/files/snort.config

@@ -1,4 +1,4 @@
 config snort 'snort'
-	option config_dir '/etc/snort/etc/'
+	option config_dir '/etc/snort/'
 	option alert_module 'alert_syslog'
 	option interface 'eth0'