fix debian and Makefile for new filters

diff --git a/debian/freeradius.install b/debian/freeradius.install
index aba570ea2921b07d253cd73f0f7fa73dac2d5081..4dd092db7ca431560cd7a8619a1161a3947b7b0c 100644 (file)
--- a/debian/freeradius.install
+++ b/debian/freeradius.install
@@ -1,9 +1,5 @@
 etc/freeradius/acct_users
-etc/freeradius/attrs
-etc/freeradius/attrs.access_reject
-etc/freeradius/attrs.access_challenge
-etc/freeradius/attrs.accounting_response
-etc/freeradius/attrs.pre-proxy
+etc/freeradius/filter/*
 etc/freeradius/clients.conf
 etc/freeradius/experimental.conf
 etc/freeradius/hints

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index c878136f74262c6136cc10f0728d5781859b2bd0..91b4b8c7856e7b73453cc1ee322cf9026dc00f89 100755 (executable)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -28,13 +28,8 @@ case "$1" in
             /etc/freeradius/experimental.conf \
             /etc/freeradius/huntgroups \
             /etc/freeradius/proxy.conf \
-            /etc/freeradius/attrs.pre-proxy \
             /etc/freeradius/hints \
-            /etc/freeradius/attrs \
             /etc/freeradius/policy.txt \
-            /etc/freeradius/attrs.accounting_response \
-            /etc/freeradius/attrs.access_reject \
-            /etc/freeradius/attrs.access_challenge \
             /etc/freeradius/clients.conf \
             /etc/freeradius/acct_users
           do
@@ -43,10 +38,11 @@ case "$1" in
             fi
           done
 
-          for dir in /etc/freeradius/certs/ \
-            /etc/freeradius/sites-available/ \
-            /etc/freeradius/sites-enabled/ \
-            /etc/freeradius/policy.d/
+          for dir in /etc/freeradius/certs \
+            /etc/freeradius/sites-available \
+            /etc/freeradius/sites-enabled \
+            /etc/freeradius/filter \
+            /etc/freeradius/policy.d
           do
             if ! dpkg-statoverride --list | grep -qw $dir$; then
               dpkg-statoverride --add --update freerad freerad 2751 $dir

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index a34c6deea8a0965cee870e40e8d815953d1f179f..cc61b011709ec018f6be11fff4dc3de6ab55185a 100755 (executable)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -14,13 +14,8 @@ case "$1" in
           /etc/freeradius/experimental.conf \
           /etc/freeradius/huntgroups \
           /etc/freeradius/proxy.conf \
-          /etc/freeradius/attrs.pre-proxy \
           /etc/freeradius/hints \
-          /etc/freeradius/attrs \
           /etc/freeradius/policy.txt \
-          /etc/freeradius/attrs.accounting_response \
-          /etc/freeradius/attrs.access_reject \
-          /etc/freeradius/attrs.access_challenge \
           /etc/freeradius/clients.conf \
           /etc/freeradius/acct_users
         do
@@ -33,6 +28,7 @@ case "$1" in
           /etc/freeradius/sites-available \
           /etc/freeradius/sites-enabled \
           /etc/freeradius/policy.d \
+          /etc/freeradius/filter \
           /var/run/freeradius \
           /var/log/freeradius
         do

diff --git a/raddb/Makefile b/raddb/Makefile
index 169a92bf9b62c95e109362e36aecc003437b870a..f7a5c922915cc87a27e5cff1bbc19859a0aa4ea2 100644 (file)
--- a/raddb/Makefile
+++ b/raddb/Makefile
@@ -9,11 +9,10 @@ include ../Make.inc
 #
 #  The list of files to install.
 #
-FILES = acct_users attrs attrs.access_reject attrs.accounting_response \
-       attrs.pre-proxy clients.conf dictionary templates.conf  \
-       experimental.conf hints huntgroups \
-       policy.txt preproxy_users proxy.conf radiusd.conf trigger.conf  \
-       users attrs.access_challenge README.rst
+FILES = acct_users clients.conf dictionary templates.conf \
+       experimental.conf hints huntgroups policy.txt \
+       preproxy_users proxy.conf radiusd.conf trigger.conf \
+       users README.rst
 
 DEFAULT_SITES = default inner-tunnel
 
@@ -59,8 +58,9 @@ install:
        $(INSTALL) -d -m 750    $(R)$(raddbdir)/mods-available
        $(INSTALL) -d -m 750    $(R)$(raddbdir)/mods-enabled
        $(INSTALL) -d -m 750    $(R)$(raddbdir)/policy.d
+       $(INSTALL) -d -m 750    $(R)$(raddbdir)/filter
        @echo "Creating/updating files in $(R)$(raddbdir)"; \
-       for i in $(FILES) `find sites-available/ mods-available/ policy.d/ -type f -print | sed 's/.*~//;s/.*#.*//' `; do \
+       for i in $(FILES) `find sites-available/ mods-available/ policy.d/ filter/ -type f -print | sed 's/.*~//;s/.*#.*//' `; do \
                [ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 640 $$i $(R)$(raddbdir)/$$i; \
                if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
                        echo "** $(R)$(raddbdir)/$$i"; \