Install all SQL config files by default (they're needed by rlm_sql_null)

diff --git a/debian/control b/debian/control
index dc3ccbc..2152639 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Build-Depends: debhelper (>= 6.0.7),
  quilt,
  dpkg-dev (>= 1.13.19),
  autotools-dev,
- libtool,
  libltdl3-dev,
  libssl-dev,
  libpam0g-dev,
@@ -16,6 +15,7 @@ Build-Depends: debhelper (>= 6.0.7),
  libperl-dev,
  libpcap-dev,
  python-dev,
+ libreadline-dev,
  libsnmp-dev,
  libpq-dev,
  libssl-dev

diff --git a/debian/freeradius-mysql.install b/debian/freeradius-mysql.install
index 81355ca..bf36d4b 100644 (file)
--- a/debian/freeradius-mysql.install
+++ b/debian/freeradius-mysql.install
@@ -1,3 +1 @@
 usr/lib/freeradius/rlm_sql_mysql*.so
-etc/freeradius/sql/mysql/*
-etc/freeradius/mods-available/sql*

diff --git a/debian/freeradius-mysql.postinst b/debian/freeradius-mysql.postinst
index 2d4b6c4..efea808 100755 (executable)
--- a/debian/freeradius-mysql.postinst
+++ b/debian/freeradius-mysql.postinst
@@ -4,20 +4,15 @@ set -e
 
 case "$1" in
   configure)
-        for file in /etc/freeradius/sql/mysql/counter.conf \
-          /etc/freeradius/sql/mysql/dialup.conf \
-          /etc/freeradius/sql/mysql/ippool.conf \
-          /etc/freeradius/sql/mysql/ippool.sql \
-          /etc/freeradius/sql/mysql/nas.sql \
-          /etc/freeradius/sql/mysql/schema.sql
+        for file in `find /etc/freeradius/sql/main/mysql/ -print`
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/mysql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/mysql
         do
           if ! dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --add --update root freerad 2751 $dir

diff --git a/debian/freeradius-mysql.prerm b/debian/freeradius-mysql.prerm
index 9f035bd..d1052a7 100644 (file)
--- a/debian/freeradius-mysql.prerm
+++ b/debian/freeradius-mysql.prerm
@@ -4,12 +4,7 @@ set -e
 
 case "$1" in
   remove)
-        for file in /etc/freeradius/sql/mysql/counter.conf \
-          /etc/freeradius/sql/mysql/dialup.conf \
-          /etc/freeradius/sql/mysql/ippool.conf \
-          /etc/freeradius/sql/mysql/ippool.sql \
-          /etc/freeradius/sql/mysql/nas.sql \
-          /etc/freeradius/sql/mysql/schema.sql
+        for file in `find /etc/freeradius/sql/main/mysql/ -print`
         do
           if dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --remove $file

diff --git a/debian/freeradius-postgresql.install b/debian/freeradius-postgresql.install
index b4c031a..0c1e55d 100644 (file)
--- a/debian/freeradius-postgresql.install
+++ b/debian/freeradius-postgresql.install
@@ -1,2 +1 @@
 usr/lib/freeradius/rlm_sql_postgresql*.so
-etc/freeradius/sql/postgresql/*

diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst
index 313310c..111f39f 100755 (executable)
--- a/debian/freeradius-postgresql.postinst
+++ b/debian/freeradius-postgresql.postinst
@@ -4,23 +4,15 @@ set -e
 
 case "$1" in
   configure)
-        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
-          /etc/freeradius/sql/postgresql/counter.conf \
-          /etc/freeradius/sql/postgresql/dialup.conf \
-          /etc/freeradius/sql/postgresql/ippool.conf \
-          /etc/freeradius/sql/postgresql/ippool.sql \
-          /etc/freeradius/sql/postgresql/nas.sql \
-          /etc/freeradius/sql/postgresql/schema.sql \
-          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
-          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        for file in `find /etc/freeradius/sql/main/postgresql/ -print` 
         do
           if ! dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --add --update root freerad 0640 $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/postgresql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/postgresql
         do
           if ! dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --add --update root freerad 2751 $dir

diff --git a/debian/freeradius-postgresql.prerm b/debian/freeradius-postgresql.prerm
index ed92461..40673c2 100644 (file)
--- a/debian/freeradius-postgresql.prerm
+++ b/debian/freeradius-postgresql.prerm
@@ -4,23 +4,15 @@ set -e
 
 case "$1" in
   remove)
-        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
-          /etc/freeradius/sql/postgresql/counter.conf \
-          /etc/freeradius/sql/postgresql/dialup.conf \
-          /etc/freeradius/sql/postgresql/ippool.conf \
-          /etc/freeradius/sql/postgresql/ippool.sql \
-          /etc/freeradius/sql/postgresql/nas.sql \
-          /etc/freeradius/sql/postgresql/schema.sql \
-          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
-          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        for file in `find /etc/freeradius/sql/main/postgresql/ -print`
         do
           if dpkg-statoverride --list | grep -qw $file$; then
             dpkg-statoverride --remove $file
           fi
         done
 
-        for dir in /etc/freeradius/sql \
-          /etc/freeradius/sql/postgresql
+        for dir in /etc/freeradius/sql/main \
+          /etc/freeradius/sql/main/postgresql
         do
           if dpkg-statoverride --list | grep -qw $dir$; then
             dpkg-statoverride --remove $dir

diff --git a/debian/freeradius.install b/debian/freeradius.install
index ea2da9b..df66779 100644 (file)
--- a/debian/freeradius.install
+++ b/debian/freeradius.install
@@ -18,6 +18,7 @@ etc/freeradius/proxy.conf
 etc/freeradius/sites-available/*
 etc/freeradius/templates.conf
 etc/freeradius/users
+etc/freeradius/sql/*
 usr/lib/freeradius/rlm*.so
 usr/sbin/checkrad
 usr/sbin/freeradius