Debian default configuration This patch sets Debian defaults for suricata configurati...

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

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

diff --git a/configure.ac b/configure.ac
index 3457a229c62962ecf5054e739fc958edc608f226..224efc43d7b3ef9b1cd95c381cb719c341d5eef7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2773,7 +2773,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 4661bb14f9c505d6de6b05983e6585662729e627..7776992b55215195b536b905dfdfdfe0b87bc967 100644 (file)
--- 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 03818e2965e96bcc92e976468b95e184b868ec7b..6b9f1599bf23f1cd116393d102b5e8e23a7a1737 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1072,8 +1072,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