Fix uncomplete 331a38e

- filter file renaming went wrong
- fix the name of the files corectly and update also makefiles

Signed-off-by: Radovan Sroka <[email protected]>

doc/Makefile.am

@@ -29,4 +29,5 @@ man_MANS = \
 	fapolicyd.rules.5 \
 	fapolicyd.trust.5 \
 	fapolicyd.conf.5 \
-	fapolicyd.filter.5
+	rpm-filter.conf.5 \
+	fapolicyd-filter.conf.5

doc/fapolicyd.filter.5 → doc/fapolicyd-filter.conf.5

@@ -1,9 +1,9 @@
-.TH FAPOLICYD.FILTER: "26" "April 2023" "Red Hat" "System Administration Utilities"
+.TH FAPOLICYD_FILTER.CONF: "15" "June 2023" "Red Hat" "System Administration Utilities"
 .SH NAME
-fapolicyd.filter \- fapolicyd filter configuration file
+fapolicyd-filter.conf \- fapolicyd filter configuration file
 .SH DESCRIPTION
 The file
-.I /etc/fapolicyd/fapolicyd.filter
+.I /etc/fapolicyd/fapolicyd-filter.conf
 contains configuration of the filter for the application allowlisting daemon. This filter specifies an allow or exclude list of files from a trust source. Valid line starts with character '+', '-' or '#' for comments. The rest of the line contains a path specification. Space can be used as indentation to add more specific filters to the previous one. Note, that only one space is required for one level of an indent. If  there are multiple specifications on the same indentation level they extend the previous line with lower indentation, usually a directory.  The path may be specified using the glob pattern. A directory specification has to end with a slash ‘/’.
 
 The filters are processed as follows: Starting from the up the to bottom while in case of a match the result (+/-) is set unless there is an indented block which describes more detailed specification of the parent level match. The same processing logic is applied to the inner filters definitions. If there is no match, the parent’s result is set. If there is no match at all, the default result is minus (-).

doc/fapolicyd.8

@@ -90,7 +90,7 @@ If you are running in the debug mode and wish to compare rule numbers reported i
 .BR fapolicyd-cli (8),
 .BR fapolicyd.rules (5),
 .BR fapolicyd.trust (5),
-.BR fapolicyd.filter (5),
+.BR fapolicyd-filter.conf (5),
 .BR fagenrules (8),
 and
 .BR fapolicyd.conf (5)

doc/rpm-filter.conf.5

@@ -1,13 +1,13 @@
 .TH FAPOLICYD.FILTER: "26" "April 2023" "Red Hat" "System Administration Utilities"
 .SH NAME
-fapolicyd.filter \- fapolicyd filter configuration file
+fapolicyd-filter.conf \- fapolicyd filter configuration file
 .SH DESCRIPTION
 The file
-.I /etc/fapolicyd/rpm-filter.filter.conf
+.I /etc/fapolicyd/rpm-filter.conf
 was migrated to
 .I /etc/fapolicyd/fapolicyd-filter.conf
 or see
-.BR fapolicyd.filter(5).
+.BR fapolicyd-filter.conf(5).
 
 
 

fapolicyd.spec

@@ -114,7 +114,7 @@ fi
 %attr(644,root,root) %{_sysconfdir}/bash_completion.d/*
 %ghost %{_sysconfdir}/%{name}/rules.d/*
 %config(noreplace) %attr(644,root,%{name}) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %attr(644,root,%{name}) %{_sysconfdir}/%{name}/fapolicyd.filter
+%config(noreplace) %attr(644,root,%{name}) %{_sysconfdir}/%{name}/%{name}-filter.conf
 %config(noreplace) %attr(644,root,%{name}) %{_sysconfdir}/%{name}/%{name}.trust
 %ghost %attr(644,root,%{name}) %{_sysconfdir}/%{name}/fapolicyd.rules
 %ghost %attr(644,root,%{name}) %{_sysconfdir}/%{name}/compiled.rules

init/Makefile.am

@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 	fapolicyd.service \
 	fapolicyd.conf \
-	fapolicyd.filter \
+	fapolicyd-filter.conf \
 	fapolicyd.trust \
 	fapolicyd-tmpfiles.conf \
 	fapolicyd-magic \
@@ -12,7 +12,7 @@ fapolicyddir = $(sysconfdir)/fapolicyd
 
 dist_fapolicyd_DATA = \
 	fapolicyd.conf \
-	fapolicyd.filter \
+	fapolicyd-filter.conf \
 	fapolicyd.trust
 
 systemdservicedir = $(systemdsystemunitdir)