From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 8 Dec 2012 17:37:28 +0000 (+0000)
Subject: Update docs and suse/rhel specs for attrs
X-Git-Tag: release_3_0_0_beta1~1410
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bfbe9ebd883b88c870ef5202f193480dd28cfb;p=thirdparty%2Ffreeradius-server.git

Update docs and suse/rhel specs for attrs
---

diff --git a/man/man5/rlm_attr_filter.5 b/man/man5/rlm_attr_filter.5
index 7845c6cce49..3cb885ffbc4 100644
--- a/man/man5/rlm_attr_filter.5
+++ b/man/man5/rlm_attr_filter.5
@@ -102,7 +102,7 @@ sample rule ordering and how to use the different operators.
 .DE
 .PP
 The configuration items are:
-.IP attrsfile
+.IP file
 This specifies the location of the file used to load the filter rules.
 This file is used to filter the accounting response, packet before it
 is proxied, proxy response from the home server, or our response to
@@ -135,7 +135,7 @@ Filters Access-Accept or Access-Reject packets.
 .PP
 .SH FILES
 .I /etc/raddb/radiusd.conf
-.I /etc/raddb/attrs
+.I /etc/raddb/filter/*
 .PP
 .SH "SEE ALSO"
 .BR radiusd (8),
diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index d1ff144d4a0..7b6f1c289be 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -279,13 +279,9 @@ fi
 # configs
 %dir %attr(755,root,radiusd) /etc/raddb
 %defattr(-,root,radiusd)
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/filter/*
 %attr(644,root,radiusd) %config(noreplace) /etc/raddb/dictionary
 %config(noreplace) /etc/raddb/acct_users
-%config(noreplace) /etc/raddb/attrs
-%config(noreplace) /etc/raddb/attrs.access_challenge
-%config(noreplace) /etc/raddb/attrs.access_reject
-%config(noreplace) /etc/raddb/attrs.accounting_response
-%config(noreplace) /etc/raddb/attrs.pre-proxy
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/clients.conf
 %config(noreplace) /etc/raddb/hints
 %config(noreplace) /etc/raddb/huntgroups
diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 3499bbf6c7d..6200f3cc7ba 100644
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -307,14 +307,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(750,-,radiusd) %{_sysconfdir}/raddb
+%attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/filter/*
 %defattr(-,root,radiusd)
 %config(noreplace) %{_sysconfdir}/raddb/dictionary
 %config(noreplace) %{_sysconfdir}/raddb/acct_users
-%config(noreplace) %{_sysconfdir}/raddb/attrs
-%config(noreplace) %{_sysconfdir}/raddb/attrs.access_reject
-%config(noreplace) %{_sysconfdir}/raddb/attrs.access_challenge
-%config(noreplace) %{_sysconfdir}/raddb/attrs.accounting_response
-%config(noreplace) %{_sysconfdir}/raddb/attrs.pre-proxy
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/clients.conf
 %config(noreplace) %{_sysconfdir}/raddb/hints
 %config(noreplace) %{_sysconfdir}/raddb/huntgroups