Merge lp:~andreserl/maas/maintain_squiddebproxy_compat into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Continue to install squid-deb-proxy extra conf and remove it on postrm for upgrades that continue to use squid-deb-proxy

[Newell Jensen (newell-jensen)]

LGTM. One thing is that a symlink is not a directory so I don't think you need the `r` in the `-rf` part of the command. Don't forget to set a commit message.

review: Approve

[Newell Jensen (newell-jensen)]

> LGTM. One thing is that a symlink is not a directory so I don't think you
> need the `r` in the `-rf` part of the command. Don't forget to set a commit
> message.

I have been advised that the packaging branches have to be done manually so not commit message needed.

=== added file 'debian/extras/99-maas'
--- debian/extras/99-maas	1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas	2014-09-23 16:32:16 +0000
@@ -0,0 +1,5 @@
+# /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+#
+# Enable launchpad personal package archives for squid-deb-proxy
+ppa.launchpad.net
+keyserver.ubuntu.com

=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2014-09-19 18:35:51 +0000
+++ debian/maas-region-controller-min.install	2014-09-23 16:32:16 +0000
@@ -41,3 +41,4 @@
 debian/extras/maas-region-celeryd usr/sbin
 debian/extras/20-maas.conf etc/rsyslog.d
 debian/extras/maas_remote_syslog_compress etc/cron.d
+debian/extras/99-maas usr/share/maas/conf

=== modified file 'debian/maas-region-controller-min.postrm'
--- debian/maas-region-controller-min.postrm	2014-09-12 19:10:04 +0000
+++ debian/maas-region-controller-min.postrm	2014-09-23 16:32:16 +0000
@@ -28,6 +28,11 @@
             invoke-rc.d apache2 restart || true
         fi
 
+        # Delete symlink
+        if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+            rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+        fi
+
         # Delete any remaining / leftover file
         rm -rf /usr/share/maas/maas/
 esac

=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2014-09-12 19:10:04 +0000
+++ debian/maas-region-controller.postrm	2014-09-23 16:32:16 +0000
@@ -35,6 +35,11 @@
 			invoke-rc.d apache2 restart || true
 		fi
 
+		# Delete symlink
+		if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+			rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+		fi
+
 		# Remove rabbitmq/longpoll/celery
 		longpoll_user="maas_longpoll"
 		longpoll_vhost="/maas_longpoll"