From 5589ef90f99feac1c30f6d29a3aaff97e5c36a0d Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Thu, 27 Jun 2013 20:48:57 +0100 Subject: [PATCH] First pass at fixing up debian packages --- debian/freeradius-mysql.postinst | 6 +++--- debian/freeradius-mysql.prerm | 6 +++--- debian/freeradius-postgresql.postinst | 6 +++--- debian/freeradius-postgresql.prerm | 6 +++--- debian/freeradius.install | 7 ++----- debian/freeradius.postinst | 10 +++++----- debian/freeradius.preinst | 9 --------- debian/freeradius.prerm | 14 ++++++++------ 8 files changed, 27 insertions(+), 37 deletions(-) diff --git a/debian/freeradius-mysql.postinst b/debian/freeradius-mysql.postinst index efea808..ebdea6e 100755 --- a/debian/freeradius-mysql.postinst +++ b/debian/freeradius-mysql.postinst @@ -4,15 +4,15 @@ set -e case "$1" in configure) - for file in `find /etc/freeradius/sql/main/mysql/ -print` + for file in `find /etc/freeradius/mods-config/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/main \ - /etc/freeradius/sql/main/mysql + for dir in /etc/freeradius/mods-config/sql/main \ + /etc/freeradius/mods-config/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 d1052a7..01fca59 100644 --- a/debian/freeradius-mysql.prerm +++ b/debian/freeradius-mysql.prerm @@ -4,15 +4,15 @@ set -e case "$1" in remove) - for file in `find /etc/freeradius/sql/main/mysql/ -print` + for file in `find /etc/freeradius/mods-config/sql/main/mysql/ -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/mysql + for dir in /etc/freeradius/mods-config/sql \ + /etc/freeradius/mods-config/sql/mysql do if dpkg-statoverride --list | grep -qw $dir$; then dpkg-statoverride --remove $dir diff --git a/debian/freeradius-postgresql.postinst b/debian/freeradius-postgresql.postinst index 111f39f..aedc5dd 100755 --- a/debian/freeradius-postgresql.postinst +++ b/debian/freeradius-postgresql.postinst @@ -4,15 +4,15 @@ set -e case "$1" in configure) - for file in `find /etc/freeradius/sql/main/postgresql/ -print` + for file in `find /etc/freeradius/mods-config/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/main \ - /etc/freeradius/sql/main/postgresql + for dir in /etc/freeradius/mods-config/sql/main \ + /etc/freeradius/mods-config/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 40673c2..55b3b56 100644 --- a/debian/freeradius-postgresql.prerm +++ b/debian/freeradius-postgresql.prerm @@ -4,15 +4,15 @@ set -e case "$1" in remove) - for file in `find /etc/freeradius/sql/main/postgresql/ -print` + for file in `find /etc/freeradius/mods-config/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/main \ - /etc/freeradius/sql/main/postgresql + for dir in /etc/freeradius/mods-config/sql/main \ + /etc/freeradius/mods-config/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 4dd092d..20b3c52 100644 --- a/debian/freeradius.install +++ b/debian/freeradius.install @@ -1,19 +1,16 @@ -etc/freeradius/acct_users -etc/freeradius/filter/* +etc/freeradius/users etc/freeradius/clients.conf etc/freeradius/experimental.conf etc/freeradius/hints etc/freeradius/huntgroups etc/freeradius/mods-available/* etc/freeradius/mods-enabled/* +etc/freeradius/mods-config/* etc/freeradius/policy.d/* etc/freeradius/certs/* -etc/freeradius/preproxy_users 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 diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst index eade06d..cd6a2c0 100755 --- a/debian/freeradius.postinst +++ b/debian/freeradius.postinst @@ -24,13 +24,13 @@ case "$1" in [ ! -f "/var/log/freeradius/${file}" ] && install -o freerad -g freerad -m 644 /dev/null /var/log/freeradius/${file} done - for file in /etc/freeradius/preproxy_users \ + for file in /etc/freeradius/mods-config/files/pre-proxy \ + /etc/freeradius/mods-config/files/accounting \ + /etc/freeradius/mods-config/preprocess/huntgroups \ + /etc/freeradius/mods-config/preprocess/hints \ /etc/freeradius/experimental.conf \ - /etc/freeradius/huntgroups \ /etc/freeradius/proxy.conf \ - /etc/freeradius/hints \ /etc/freeradius/clients.conf \ - /etc/freeradius/acct_users do if ! dpkg-statoverride --list | grep -qw $file$; then dpkg-statoverride --add --update root freerad 0640 $file @@ -40,7 +40,7 @@ case "$1" in for dir in /etc/freeradius/certs \ /etc/freeradius/sites-available \ /etc/freeradius/sites-enabled \ - /etc/freeradius/filter \ + /etc/freeradius/mods-config/attr_filter \ /etc/freeradius/policy.d do if ! dpkg-statoverride --list | grep -qw $dir$; then diff --git a/debian/freeradius.preinst b/debian/freeradius.preinst index cf3c2e2..9c02fb8 100644 --- a/debian/freeradius.preinst +++ b/debian/freeradius.preinst @@ -55,15 +55,6 @@ case "$1" in rm_conffile "/etc/freeradius/certs/root.der" rm_conffile "/etc/freeradius/certs/root.p12" rm_conffile "/etc/freeradius/certs/root.pem" - - rm_conffile "/etc/freeradius/sqlippool.conf" - rm_conffile "/etc/freeradius/mssql.conf" - rm_conffile "/etc/freeradius/postgresql.conf" - - rm_conffile "/etc/freeradius/naslist" - rm_conffile "/etc/freeradius/naspasswd" - rm_conffile "/etc/freeradius/realms" - fi # old files shipped by this package previously, but dropped upstream diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm index efc1149..b0ddce1 100755 --- a/debian/freeradius.prerm +++ b/debian/freeradius.prerm @@ -10,13 +10,13 @@ case "$1" in /etc/init.d/freeradius stop fi - for file in /etc/freeradius/preproxy_users \ + for file in /etc/freeradius/mods-config/files/pre-proxy \ + /etc/freeradius/mods-config/preprocess/huntgroups \ + /etc/freeradius/mods-config/preprocess/hints \ + /etc/freeradius/mods-config/files/accounting /etc/freeradius/experimental.conf \ - /etc/freeradius/huntgroups \ /etc/freeradius/proxy.conf \ - /etc/freeradius/hints \ - /etc/freeradius/clients.conf \ - /etc/freeradius/acct_users + /etc/freeradius/clients.conf do if dpkg-statoverride --list | grep -qw $file$; then dpkg-statoverride --remove $file @@ -26,8 +26,10 @@ case "$1" in for dir in /etc/freeradius/certs \ /etc/freeradius/sites-available \ /etc/freeradius/sites-enabled \ + /etc/freeradius/mods-available \ + /etc/freeradius/mods-enabled \ + /etc/freeradius/mods-config \ /etc/freeradius/policy.d \ - /etc/freeradius/filter \ /var/run/freeradius \ /var/log/freeradius do -- 2.1.4