python: put some defaults on suricata.config.defaults

This is a module that can contain installation default. For now
it includes the sysconfdir, and rules data directory for use
by suricata-update.

diff --git a/configure.ac b/configure.ac
index 66b09a9f2a62ed8522b7ea9363c82a10e26475d7..12a7d179f0d98670337b7913b482184d224a3f37 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2266,7 +2266,7 @@ AC_SUBST(CONFIGURE_SYSCONDIR)
 AC_SUBST(CONFIGURE_LOCALSTATEDIR)
 AC_SUBST(PACKAGE_VERSION)
 
-AC_OUTPUT(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/.cargo/config qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile doc/userguide/Makefile contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile contrib/tile_pcie_logd/Makefile suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service python/Makefile python/bin/suricatasc ebpf/Makefile)
+AC_OUTPUT(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/.cargo/config qa/Makefile qa/coccinelle/Makefile rules/Makefile doc/Makefile doc/userguide/Makefile contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile contrib/tile_pcie_logd/Makefile suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service python/Makefile python/suricata/config/defaults.py python/bin/suricatasc ebpf/Makefile)
 
 SURICATA_BUILD_CONF="Suricata Configuration:
   AF_PACKET support:                       ${enable_af_packet}

diff --git a/python/.gitignore b/python/.gitignore
index 6dead4f6ab6bb584c9eea9cc43156aae034f71c9..21cc772571dc9ceaac960069f907f5f11d55d57f 100644 (file)
--- a/python/.gitignore
+++ b/python/.gitignore
@@ -5,3 +5,5 @@ lib/
 scripts-*/
 bin/suricatasc
 !bin/suricatasc.in
+suricata/config/defaults.py
+!suricata/config/defaults.py.in

diff --git a/python/setup.py b/python/setup.py
index 6a6d2a03f34ec4b4022b2bfd8f4d9270bee079db..08f43bf6eecd96b01462c3562e6c1706a8b62124 100644 (file)
--- a/python/setup.py
+++ b/python/setup.py
@@ -28,6 +28,7 @@ setup(
     url='https://www.suricata-ids.org/',
     packages=[
         "suricata",
+        "suricata.config",
         "suricata.ctl",
         "suricata.sc",
         "suricatasc",

diff --git a/python/suricata/config/__init__.py b/python/suricata/config/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/python/suricata/config/defaults.py.in b/python/suricata/config/defaults.py.in
new file mode 100644 (file)
index 0000000..3156e81
--- /dev/null
+++ b/python/suricata/config/defaults.py.in
@@ -0,0 +1,2 @@
+sysconfdir = "@e_sysconfdir@"
+datarulesdir = "@e_datarulesdir@"