From: Alan Buxey <alan.buxey@gmail.com>
Date: Wed, 20 Feb 2013 21:55:54 +0000 (+0000)
Subject: goodbye policy.txt
X-Git-Tag: release_3_0_0_beta1~975^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=037409230bc717ca36011969ffca0c53268453d0;p=thirdparty%2Ffreeradius-server.git

goodbye policy.txt

remove policy.txt to stop errors on make install etc
---

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 91b4b8c7856..eade06d584b 100755
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -29,7 +29,6 @@ case "$1" in
             /etc/freeradius/huntgroups \
             /etc/freeradius/proxy.conf \
             /etc/freeradius/hints \
-            /etc/freeradius/policy.txt \
             /etc/freeradius/clients.conf \
             /etc/freeradius/acct_users
           do
diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index cc61b011709..efc1149dbb4 100755
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -15,7 +15,6 @@ case "$1" in
           /etc/freeradius/huntgroups \
           /etc/freeradius/proxy.conf \
           /etc/freeradius/hints \
-          /etc/freeradius/policy.txt \
           /etc/freeradius/clients.conf \
           /etc/freeradius/acct_users
         do
diff --git a/raddb/Makefile b/raddb/Makefile
index 7b35d757a9b..ab8b0836712 100644
--- a/raddb/Makefile
+++ b/raddb/Makefile
@@ -10,7 +10,7 @@ include ../Make.inc
 #  The list of files to install.
 #
 FILES = acct_users clients.conf dictionary templates.conf \
-	experimental.conf hints huntgroups policy.txt \
+	experimental.conf hints huntgroups \
 	preproxy_users proxy.conf radiusd.conf trigger.conf \
 	users README.rst
 
diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 9fd79b976d9..d44c694aec2 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -300,7 +300,8 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sites-enabled/*
 %config(noreplace) %attr(640,root,radiusd) /etc/raddb/example.pl
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.conf
-%config(noreplace) /etc/raddb/policy.txt
+%dir %attr(750,root,radiusd) /etc/raddb/policy.d
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/policy.d/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/templates.conf
 %dir %attr(750,root,radiusd) /etc/raddb/modules
 %dir %attr(750,root,radiusd) /etc/raddb/mods-available
diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 283dfe89651..a9cffa58a7a 100644
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -299,8 +299,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-enabled/*
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/eap.conf
 %attr(640,-,radiusd) %{_sysconfdir}/raddb/example.pl
-%attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/policy.conf
-%{_sysconfdir}/raddb/policy.txt
+%attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/policy.d/*.
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/templates.conf
 %attr(700,radiusd,radiusd) %dir /var/run/radiusd/
 # binaries