Merge lp:~smoser/maas/packaging-1.8-lp1474417 into lp:~maas-maintainers/maas/packaging-1.8

[Scott Moser]

maas-proxy: sync apt specific squid config with squid-deb-proxy

This improves maas-proxy for handling apt specific files. And
generally syncs it up with squid-deb-proxy's config files.

backport of maas-proxy changes from https://code.launchpad.net/~smoser/maas/packaging-lp1474417/+merge/264875

[Lee Trager (ltrager)]

LGTM!

review: Approve

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-13 15:06:24 +0000
+++ debian/changelog	2015-07-20 13:37:25 +0000
@@ -1,4 +1,4 @@
-maas (1.8.1+bzr4019-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.8.1+bzr4019-0ubuntu2) UNRELEASED; urgency=medium
 
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
@@ -12,7 +12,12 @@
       is always run.
   * debian/control: Make maas-dns a Dependy of maas-region-controller.
 
- -- Andres Rodriguez <[e-mail]>  Mon, 06 Jul 2015 23:52:59 -0400
+  [ Scott Moser ]
+  * maas-proxy: sync white space changes with trunk packaging branch
+  * maas-proxy: sync apt specific squid config with squid-deb-proxy
+    (LP: #1474417)
+
+ -- Scott Moser <[e-mail]>  Mon, 20 Jul 2015 09:32:08 -0400
 
 maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
 
 
=== modified file 'debian/extras/maas-proxy.conf'
--- debian/extras/maas-proxy.conf	2014-09-12 19:10:04 +0000
+++ debian/extras/maas-proxy.conf	2015-07-20 13:37:25 +0000
@@ -5,10 +5,10 @@
 acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
 acl localnet src all # TODO: We should auto-generate this with the networks MAAS manages/knows about.
 acl SSL_ports port 443
-acl Safe_ports port 80		# http
-acl Safe_ports port 21		# ftp
-acl Safe_ports port 443		# https
-acl Safe_ports port 1025-65535	# unregistered ports
+acl Safe_ports port 80          # http
+acl Safe_ports port 21          # ftp
+acl Safe_ports port 443         # https
+acl Safe_ports port 1025-65535  # unregistered ports
 acl CONNECT method CONNECT
 http_access allow maas_proxy_manager localhost
 http_access deny maas_proxy_manager
@@ -20,10 +20,13 @@
 http_port 3128 transparent
 http_port 8000
 coredump_dir /var/spool/maas-proxy
-refresh_pattern ^ftp:		1440	20%	10080
-refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
-refresh_pattern (Release|Packages(.gz)*)$      0       20%     2880
-refresh_pattern .		0	20%	4320
+refresh_pattern ^ftp:           1440    20%     10080
+refresh_pattern -i (/cgi-bin/|\?) 0     0%      0
+refresh_pattern \/Release(|\.gpg)$                        0    0%    0 refresh-ims
+refresh_pattern \/InRelease$                              0    0%    0 refresh-ims
+refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$   0    0%    0 refresh-ims
+refresh_pattern \/(Translation-.*)(|\.bz2|\.gz|\.xz)$     0    0%    0 refresh-ims
+refresh_pattern .               0       20%     4320
 forwarded_for delete
 visible_hostname maas.proxy # TODO: This should be autogenerated by a template.
 cache_mem 512 MB