Debian packaging statoverrides new cert location

diff --git a/debian/freeradius-config.postinst b/debian/freeradius-config.postinst
index 93c48dc2af6d8ba77a9dbedf2008ee29ca0d997b..03b5a1fe6290bd5b47e877641cfc07fec77c7b36 100644 (file)
--- a/debian/freeradius-config.postinst
+++ b/debian/freeradius-config.postinst
@@ -19,12 +19,18 @@ case "$1" in
             dpkg-statoverride --add --update root freerad 0644 /etc/freeradius/dictionary
           fi
 
-          # Create snakoil certificates on initial install
+          # Create snakeoil certificates on initial install
           make -C /etc/freeradius/certs/
 
-          if ! dpkg-statoverride --list | grep -qw /etc/freeradius/certs/server.pem$; then
-            dpkg-statoverride --add --update root freerad 0640 /etc/freeradius/certs/server.pem
-          fi
+          for file in /etc/freeradius/certs/rsa/server.pem \
+            /etc/freeradius/certs/rsa/server.key \
+            /etc/freeradius/certs/ecc/server.pem \
+            /etc/freeradius/certs/ecc/server.key
+         do
+            if ! dpkg-statoverride --list | grep -qw $file$; then
+              dpkg-statoverride --add --update root freerad 0640 $file
+            fi
+         done
 
           # Create links for default modules
           for mod in always attr_filter cache_eap chap \

diff --git a/debian/freeradius-config.postrm b/debian/freeradius-config.postrm
index f619d8ba9ca189686a47884639dc2c3922297384..ff33d7c8fb0a236a9a2735bb6d2d739a4864c846 100644 (file)
--- a/debian/freeradius-config.postrm
+++ b/debian/freeradius-config.postrm
@@ -20,21 +20,18 @@ case "$1" in
                        fi
                done
 
-               if dpkg-statoverride --list | grep -qw /etc/freeradius/certs/server.pem$; then
-                       dpkg-statoverride --remove /etc/freeradius/certs/server.pem
-               fi
-
-               if dpkg-statoverride --list | grep -qw /etc/freeradius/dictionary$; then
-                       dpkg-statoverride --remove /etc/freeradius/dictionary
-               fi
-
-               if dpkg-statoverride --list | grep -qw /etc/freeradius/radiusd.conf$; then
-                       dpkg-statoverride --remove /etc/freeradius/radiusd.conf
-               fi
-
-               if dpkg-statoverride --list | grep -qw /etc/freeradius$; then
-                       dpkg-statoverride --remove /etc/freeradius
-               fi
+               for file in /etc/freeradius/certs/rsa/server.pem \
+                 /etc/freeradius/certs/rsa/server.key \
+                 /etc/freeradius/certs/ecc/server.pem \
+                 /etc/freeradius/certs/ecc/server.key \
+                 /etc/freeradius/dictionary \
+                 /etc/freeradius/radiusd.conf \
+                 /etc/freeradius
+               do
+                       if dpkg-statoverride --list | grep -qw $file$; then
+                               dpkg-statoverride --remove $file
+                       fi
+               done
 
                test -d /etc/freeradius && rmdir --ignore-fail-on-non-empty /etc/freeradius
                ;;

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index ea911385264f18f62ac9c62079205b344a144767..d1ad8107397db3a124d202cd9a27f3551f3ada26 100644 (file)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -37,6 +37,8 @@ case "$1" in
           done
 
           for dir in /etc/freeradius/certs \
+            /etc/freeradius/certs/rsa \
+            /etc/freeradius/certs/ecc \
             /etc/freeradius/sites-available \
             /etc/freeradius/sites-enabled \
             /etc/freeradius/mods-config/attr_filter \

diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index e77702d2ec4f4815141c3d8fde06f6344fe551df..d35359ff000b5bd192f1b29d06e7dca8efe8b77f 100644 (file)
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -21,6 +21,8 @@ case "$1" in
         done
 
         for dir in /etc/freeradius/certs \
+          /etc/freeradius/certs/rsa \
+          /etc/freeradius/certs/ecc \
           /etc/freeradius/sites-available \
           /etc/freeradius/sites-enabled \
           /etc/freeradius/mods-available \