Update paths in reporter.conf, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitignore b/.gitignore
index d1df166a7b052b7fa77f89e7a20839be8f07e7be..aebe8eae5baa58b30a2a0d94dd6f07b310d2d7a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /configure
 /config.log
 /config.status
+/src/reporter.conf
 /src/suricata-reporter
 /src/suricata-report-generator
 /*.m4

diff --git a/Makefile.am b/Makefile.am
index 33b755da5e833dbea6bc384c79eaac4ac58b754b..6449ae4fe82b65bf48321e94d22a831953555ccf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,13 @@ CLEANFILES += \
 
 # ------------------------------------------------------------------------------
 
-dist_suricataconf_DATA = \
+suricataconf_DATA = \
+       src/reporter.conf
+
+EXTRA_DIST += \
+       src/reporter.conf.in
+
+CLEANFILES += \
        src/reporter.conf
 
 # ------------------------------------------------------------------------------

diff --git a/src/reporter.conf b/src/reporter.conf.in
similarity index 95%
rename from src/reporter.conf
rename to src/reporter.conf.in
index 071e4cae0a60158ceca4d35f901742d8051fed91..3db6210eb9459b7096bc6c3b3de4ad39a5f10742 100644 (file)
--- a/src/reporter.conf
+++ b/src/reporter.conf.in
@@ -17,7 +17,7 @@
 ;group = suricata
 
 ; The path to the database
-;database = /var/log/suricata/reporter.db
+;database = @suricatalogdir@/reporter.db
 
 [syslog]
 ; Enable sending any alerts to syslog in the human-reable fast.log format