Merge pull request #1859 from njm506/v3.0.x

v3.0.x: cherry-pick module/site symlink packaging changes from 4.0.x

debian/freeradius-config.postinst

@@ -21,6 +21,28 @@ case "$1" in
 
           # Create snakoil certificates on initial install
           make -C /etc/freeradius/certs/
+
+          # Create links for default modules
+          for mod in always attr_filter cache_eap chap \
+              detail detail.log digest dynamic_clients eap \
+              eap_inner echo exec expiration expr files linelog logintime \
+              mschap ntlm_auth pap passwd preprocess radutmp realm \
+              replicate soh sradutmp unix unpack utf8 ; do
+            if [ ! -e /etc/freeradius/mods-enabled/$mod ]; then
+              ln -s ../mods-available/$mod /etc/freeradius/mods-enabled/$mod
+            fi
+          done
+        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

debian/freeradius-config.postrm

@@ -6,6 +6,20 @@ 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
+
+		# Remove dangling links from mods-enabled.
+		for link in /etc/freeradius/mods-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

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

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

debian/rules

@@ -156,6 +156,11 @@ install-arch: build-arch-stamp
 	mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
 	mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
 
+	# don't package symlinks in sites-enabled and mods-enabled - they're
+	# created on install by freeradius-config.postinst
+	rm $(freeradius_dir)/etc/freeradius/sites-enabled/*
+	rm $(freeradius_dir)/etc/freeradius/mods-enabled/*
+
 	dh_install -i --sourcedir=$(freeradius_dir)
 	dh_install --sourcedir=$(freeradius_dir) -p libfreeradius3
 	dh_install --sourcedir=$(freeradius_dir) -p libfreeradius-dev