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

[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.

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

bug 1474417 raised the issue that Translation files in apt need to be
handled as Packages/Sources files. This lead me to just compare the
settings between squid-deb-proxy and maas-proxy for apt specific files.

The changes are (ordered generally by immediate importance):
 a.) consider Translation files
     upstream ubuntu mirrors started including Translation files in the
     Release file, which meant that apt started failing on hash sum
     mismatches of Translation-* files.
     That archive-mirror-side change to launchpad (bug 1313576)
     was one reason that people started seeing increased hash sum
     mismatches on 'apt-get update' on Translation-* files.
 b.) change parameters, and use 'refresh-ims'
     The use/lack-of-use of refresh-ims might have been by design in
     the maas proxy config. It seems like adding refresh-ims would
     definitely increase the number of connections that squid does
     to upstream mirrors.
     See http://www.squid-cache.org/Doc/config/refresh_pattern/
     for more info.
 c.) consider Release.gpg
     Release and Release.gpg have to be kept in sync, so Release.gpg
     should have the same rules applied to it as Release.
 d.) consider InRelease (inline signed release file, currently used by
     debian, hopefully to eventually be used by ubuntu and thus remove
     the race condition between Release and Release.gpg
 e.) consider Sources
     this would better handle sources files which would result in
     has sum mismatches on deb-src lines.
 f.) consider compression of bz2 or xz
     This change would affect debian or explicitly configured ubuntu
     systems more.
 g.) anchor the matches to a '/' reducing false positives

[Scott Moser (smoser)]

Apparently the existing config came as recommendation from IS, so I've requested that IS review this change to it.

[Michael Vogt (mvo)]

I don't know much about MAAS but fwiw these are the proxy setings that squid-deb-proxy is also using.

[David Lawson (deej)]

+1

review: Approve

[David Lawson (deej)]

This looks completely reasonable, as smoser pointed out, translations have been handled inconsistently and you generally want to prefer IMS for static content like this whenever possible. I'm all in favor of these changes.

[Lee Trager (ltrager)]

LGTM!

review: Approve

[Andres Rodriguez (andreserl)]

Approved.

Scott, please create a backport branch to: lp:~maas-maintainers/maas/packaging-1.8

Thanks.

review: Approve

[Christian Reis (kiko)]

This looks low-risk enough for 1.7 even

[Scott Moser (smoser)]

1.8 branch at https://code.launchpad.net/~smoser/maas/packaging-1.8-lp1474417/+merge/265261

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-13 18:13:33 +0000
+++ debian/changelog	2015-07-15 16:26:24 +0000
@@ -2,6 +2,10 @@
 
   * UNRELEASED
 
+  [ Scott Moser ]
+  * maas-proxy: sync apt specific squid config with squid-deb-proxy
+    (LP: #1474417)
+
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
   * Drop dependency on python-iscpy: the code has been integrated into

=== modified file 'debian/extras/maas-proxy.conf'
--- debian/extras/maas-proxy.conf	2015-06-17 16:36:09 +0000
+++ debian/extras/maas-proxy.conf	2015-07-15 16:26:24 +0000
@@ -22,7 +22,10 @@
 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 \/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.