goodbye policy.txt

remove policy.txt to stop errors on make install etc

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 91b4b8c7856e7b73453cc1ee322cf9026dc00f89..eade06d584b33464357fc3102d3151d545f03f39 100755 (executable)
--- 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 cc61b011709ec018f6be11fff4dc3de6ab55185a..efc1149dbb40ec4005e875f754e0eab1a3eedff3 100755 (executable)
--- 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 7b35d757a9bd7a7ed72a6edc6c27907606ee9bb7..ab8b0836712f6a1fc96b69d566cc06b1dc010d60 100644 (file)
--- 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 9fd79b976d9bdf7ae132950580a7d55c31ab3bd7..d44c694aec293831976785333222efe914e40257 100644 (file)
--- 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 283dfe89651d7c6ce1055ee93bee44101808442b..a9cffa58a7a577bcab1bc9ac0511eaaed824dc25 100644 (file)
--- 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