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 132e8c99dc855b39a12ba220b861bae95f5d274a..6d60d2f7d3ba4c25fdb2ec20ff0fa60b136170bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2575,7 +2575,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(localstatedir, e_defaultruledir, "/lib/suricata/rules")

diff --git a/src/unix-manager.c b/src/unix-manager.c
index 9fb5bd7935bcf372572f4f975013f01d40a5bac0..322cc6914e468922d7b05d99c8c44b13cbaf42d5 100644 (file)
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -57,7 +57,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 3ead5f53dc39be84dab58256c06f24559c7a2bbc..ecc9381611729987c0e5eda216cc2663383e2ffe 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1292,8 +1292,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