Package: freeradius
Version: 2.0.4+dfsg-6
Tags: patch

Links in /etc/freeradius/sites-enabled are currently shipped with the
binary package and recreated on upgrade even if the user removes them.
This can lead to an unusable configuration; for example, inner-tunnel
breaks completely if EAP is disabled in radiusd.conf.

Please handle this more like Apache -- create the links on initial
install, then leave them to the user.  Patch attached.

Thanks,

Matej
--- freeradius-2.0.4+dfsg~/debian/freeradius.links
+++ freeradius-2.0.4+dfsg/debian/freeradius.links
@@ -1,2 +0,0 @@
-etc/freeradius/sites-available/inner-tunnel 
etc/freeradius/sites-enabled/inner-tunnel
-etc/freeradius/sites-available/default etc/freeradius/sites-enabled/default
--- freeradius-2.0.4+dfsg~/debian/freeradius.postinst
+++ freeradius-2.0.4+dfsg/debian/freeradius.postinst
@@ -62,6 +62,17 @@
           action="restart"
         fi
 
+        # Create links for default sites, but only if this is an initial
+        # install or an upgrade from before there were links; users may
+        # want to remove them...
+        if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.0.4+dfsg-4; then
+          for site in default inner-tunnel; do
+            if [ ! -e /etc/freeradius/sites-enabled/$site ]; then
+              ln -s ../sites-available/$site 
/etc/freeradius/sites-enabled/$site
+            fi
+          done
+        fi
+
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
           invoke-rc.d freeradius $action || true
         else
--- freeradius-2.0.4+dfsg~/debian/freeradius.postrm
+++ freeradius-2.0.4+dfsg/debian/freeradius.postrm
@@ -7,6 +7,13 @@
                ;;
         purge)
                update-rc.d -f freeradius remove >/dev/null
+
+               # Remove dangling links from sites-enabled.
+               for link in /etc/freeradius/sites-enabled/*; do
+                 if [ -L "$link" ] && [ ! -e "$link" ]; then
+                   rm -f "$link"
+                 fi
+               done
                ;;
 esac
 

Reply via email to