From: Arturo Borrero Gonzalez <arturo@debian.org>
Date: Tue, 12 Jul 2022 14:57:16 +0000 (+0100)
Subject: Debian default configuration This patch sets Debian defaults for suricata configurati... 
X-Git-Tag: archive/raspbian/1%6.0.6-1+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3283a18144c12f32c88b9bdca743ea47fadcb8de;p=suricata.git

Debian default configuration This patch sets Debian defaults for suricata configuration. . Currently, it sets a proper path for suricata unix socket.

Forwarded: not-needed
Last-Update: 2016-12-01


Gbp-Pq: Name debian-default-cfg.patch
---

diff --git a/configure.ac b/configure.ac
index b8086949..284f2331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2774,7 +2774,7 @@ 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(localstatedir, e_localstatedir, "/run/suricata")
+    EXPAND_VARIABLE(localstatedir, e_localstatedir, "/run/")
     EXPAND_VARIABLE(datadir, e_datarulesdir, "/suricata/rules")
     EXPAND_VARIABLE(localstatedir, e_datadir, "/lib/suricata/data")
     EXPAND_VARIABLE(ruledirprefix, e_defaultruledir, "/suricata/rules")
diff --git a/src/unix-manager.c b/src/unix-manager.c
index 4661bb14..7776992b 100644
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -53,7 +53,7 @@
 # endif
 #endif
 
-#define SOCKET_PATH LOCAL_STATE_DIR "/run/suricata/"
+#define SOCKET_PATH LOCAL_STATE_DIR "/"
 #define SOCKET_FILENAME "suricata-command.socket"
 #define SOCKET_TARGET SOCKET_PATH SOCKET_FILENAME
 
diff --git a/suricata.yaml.in b/suricata.yaml.in
index 1e03aad7..d9f73941 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1075,8 +1075,8 @@ host-mode: auto
 # activated in live capture mode. You can use the filename variable to set
 # the file name of the socket.
 unix-command:
-  enabled: auto
-  #filename: custom.socket
+  enabled: yes
+  filename: @e_localstatedir@suricata-command.socket
 
 # Magic file. The extension .mgc is added to the value here.
 #magic-file: /usr/share/file/magic