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

Proposed by Scott Moser on 2015-07-20
Status: Merged
Approved by: Blake Rouse on 2015-07-21
Approved revision: 413
Merged at revision: 412
Proposed branch: lp:~smoser/maas/packaging-1.8-lp1474417
Merge into: lp:~maas-maintainers/maas/packaging-1.8
Diff against target: 60 lines (+18/-10)
2 files modified
debian/changelog (+7/-2)
debian/extras/maas-proxy.conf (+11/-8)
To merge this branch: bzr merge lp:~smoser/maas/packaging-1.8-lp1474417
Reviewer Review Type Date Requested Status
Blake Rouse Approve on 2015-07-21
Lee Trager 2015-07-20 Approve on 2015-07-21
Review via email: mp+265261@code.launchpad.net

Commit message

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.

Description of the change

To post a comment you must log in.
Lee Trager (ltrager) wrote :

LGTM!

review: Approve
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-07-13 15:06:24 +0000
3+++ debian/changelog 2015-07-20 13:37:25 +0000
4@@ -1,4 +1,4 @@
5-maas (1.8.1+bzr4019-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.8.1+bzr4019-0ubuntu2) UNRELEASED; urgency=medium
7
8 [ Raphaƫl Badin ]
9 * Enable proxy_wstunnel module.
10@@ -12,7 +12,12 @@
11 is always run.
12 * debian/control: Make maas-dns a Dependy of maas-region-controller.
13
14- -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jul 2015 23:52:59 -0400
15+ [ Scott Moser ]
16+ * maas-proxy: sync white space changes with trunk packaging branch
17+ * maas-proxy: sync apt specific squid config with squid-deb-proxy
18+ (LP: #1474417)
19+
20+ -- Scott Moser <smoser@ubuntu.com> Mon, 20 Jul 2015 09:32:08 -0400
21
22 maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
23
24
25=== modified file 'debian/extras/maas-proxy.conf'
26--- debian/extras/maas-proxy.conf 2014-09-12 19:10:04 +0000
27+++ debian/extras/maas-proxy.conf 2015-07-20 13:37:25 +0000
28@@ -5,10 +5,10 @@
29 acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
30 acl localnet src all # TODO: We should auto-generate this with the networks MAAS manages/knows about.
31 acl SSL_ports port 443
32-acl Safe_ports port 80 # http
33-acl Safe_ports port 21 # ftp
34-acl Safe_ports port 443 # https
35-acl Safe_ports port 1025-65535 # unregistered ports
36+acl Safe_ports port 80 # http
37+acl Safe_ports port 21 # ftp
38+acl Safe_ports port 443 # https
39+acl Safe_ports port 1025-65535 # unregistered ports
40 acl CONNECT method CONNECT
41 http_access allow maas_proxy_manager localhost
42 http_access deny maas_proxy_manager
43@@ -20,10 +20,13 @@
44 http_port 3128 transparent
45 http_port 8000
46 coredump_dir /var/spool/maas-proxy
47-refresh_pattern ^ftp: 1440 20% 10080
48-refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
49-refresh_pattern (Release|Packages(.gz)*)$ 0 20% 2880
50-refresh_pattern . 0 20% 4320
51+refresh_pattern ^ftp: 1440 20% 10080
52+refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
53+refresh_pattern \/Release(|\.gpg)$ 0 0% 0 refresh-ims
54+refresh_pattern \/InRelease$ 0 0% 0 refresh-ims
55+refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$ 0 0% 0 refresh-ims
56+refresh_pattern \/(Translation-.*)(|\.bz2|\.gz|\.xz)$ 0 0% 0 refresh-ims
57+refresh_pattern . 0 20% 4320
58 forwarded_for delete
59 visible_hostname maas.proxy # TODO: This should be autogenerated by a template.
60 cache_mem 512 MB

Subscribers

People subscribed via source and target branches

to all changes: