From: Graham Clinch <g.clinch@lancaster.ac.uk>
Date: Sat, 1 Oct 2016 22:01:11 +0000 (+0100)
Subject: freeradius-config is the package responsible creating and removing symlinks
X-Git-Tag: release_3_0_13~32^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18ceb1a43530168112d20b8d2cdff533b330096f;p=thirdparty%2Ffreeradius-server.git

freeradius-config is the package responsible creating and removing symlinks
---

diff --git a/debian/freeradius-config.postinst b/debian/freeradius-config.postinst
index 6dc9156d3f4..d6084cbed08 100644
--- a/debian/freeradius-config.postinst
+++ b/debian/freeradius-config.postinst
@@ -22,6 +22,17 @@ case "$1" in
           # Create snakoil certificates on initial install
           make -C /etc/freeradius/certs/
         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
         ;;
 esac
 
diff --git a/debian/freeradius-config.postrm b/debian/freeradius-config.postrm
index e8ca770f384..be0f11fd0d0 100644
--- a/debian/freeradius-config.postrm
+++ b/debian/freeradius-config.postrm
@@ -6,6 +6,13 @@ case "$1" in
 	remove)
 		;;
 	purge)
+		# 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
+
 		if dpkg-statoverride --list | grep -qw /etc/freeradius/dictionary$; then
 			dpkg-statoverride --remove /etc/freeradius/dictionary
 		fi
diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 4265cac223d..4fb2af37844 100644
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -55,17 +55,6 @@ case "$1" in
           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
diff --git a/debian/freeradius.postrm b/debian/freeradius.postrm
index 7dfeea91f44..97c7b4fb9c8 100644
--- a/debian/freeradius.postrm
+++ b/debian/freeradius.postrm
@@ -8,13 +8,6 @@ case "$1" in
         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
-
 	       if [ -L /etc/freeradius/certs/server.pem ]; then
 	         rm -f /etc/freeradius/certs/server.pem
 	       fi