]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
config: install classification.config (and ref) to $datadir
authorJason Ish <jason.ish@oisf.net>
Tue, 1 Oct 2019 16:00:29 +0000 (10:00 -0600)
committerVictor Julien <victor@inliniac.net>
Wed, 9 Oct 2019 14:06:57 +0000 (16:06 +0200)
Install classification.config and reference.config to $datadir,
where they can be updated on every upgrade.

This required moving them into a sub-directory for autotools
to do its thing.

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/3209

Makefile.am
etc/Makefile.am
etc/classification.config [moved from classification.config with 100% similarity]
etc/reference.config [moved from reference.config with 100% similarity]

index bb7abe112e2cbe64413716f1a468ccbab71880e3..c1c81c22765f2ef45cb789139d1a9bb13d5b5b78 100644 (file)
@@ -3,8 +3,8 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \
-             classification.config threshold.config \
-             reference.config $(SURICATA_UPDATE_DIR) \
+             threshold.config \
+             $(SURICATA_UPDATE_DIR) \
             lua
 SUBDIRS = $(HTP_DIR) rust src qa rules doc contrib etc python ebpf \
           $(SURICATA_UPDATE_DIR)
@@ -22,8 +22,8 @@ install-full:
 install-conf:
        install -d "$(DESTDIR)$(e_sysconfdir)"
        @test -e "$(DESTDIR)$(e_sysconfdir)/suricata.yaml" || install -m 600 "$(top_srcdir)/suricata.yaml" "$(DESTDIR)$(e_sysconfdir)"
-       @test -e "$(DESTDIR)$(e_sysconfdir)/classification.config" || install -m 600 "$(top_srcdir)/classification.config" "$(DESTDIR)$(e_sysconfdir)"
-       @test -e "$(DESTDIR)$(e_sysconfdir)/reference.config" || install -m 600 "$(top_srcdir)/reference.config" "$(DESTDIR)$(e_sysconfdir)"
+       @test -e "$(DESTDIR)$(e_sysconfdir)/classification.config" || install -m 600 "$(top_srcdir)/etc/classification.config" "$(DESTDIR)$(e_sysconfdir)"
+       @test -e "$(DESTDIR)$(e_sysconfdir)/reference.config" || install -m 600 "$(top_srcdir)/etc/reference.config" "$(DESTDIR)$(e_sysconfdir)"
        @test -e "$(DESTDIR)$(e_sysconfdir)/threshold.config" || install -m 600 "$(top_srcdir)/threshold.config" "$(DESTDIR)$(e_sysconfdir)"
        install -d "$(DESTDIR)$(e_logfilesdir)"
        install -d "$(DESTDIR)$(e_logcertsdir)"
index b01b85d927528a378b6fd7fa095cadc3f2af511f..0466d5b7dd42b3611a451d7194134aeb2ea76d99 100644 (file)
@@ -1,2 +1,7 @@
+etcdatadir =   $(datadir)/suricata
+
 EXTRA_DIST =   suricata.logrotate.in \
                suricata.service.in
+
+dist_etcdata_DATA =    classification.config \
+                       reference.config
similarity index 100%
rename from reference.config
rename to etc/reference.config