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 fa0d129cef35b9cf197d9e1d7504de56dfd12f45..378b00de4a4634d318e4f011ac43d569b9b26d3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2603,7 +2603,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 df53f3c2f2cfb959687cfb2229d134c182059a8d..f118874aa5b817b8785297de57c9bbd825721eaf 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 c329cc2be30745f7c82988a8c8be92d6020a6dba..ed63d86e1a6d5d438be61b42e0505c2087ccdd8a 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1302,8 +1302,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