Juju Charms Collection
squid-reverseproxy package

Merge lp:~brad-marshall/charms/precise/squid-reverseproxy/http-port-config into lp:charms/squid-reverseproxy

  1. Precise Pangolin (12.04)
  2. http-port-config
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merge reported by: Marco Ceppi
Merged at revision: not available
Proposed branch: lp:~brad-marshall/charms/precise/squid-reverseproxy/http-port-config
Merge into: lp:charms/squid-reverseproxy
Diff against target: 24 lines (+5/-1)
2 files modified
config.yaml (+4/-0)
templates/main_config.template (+1/-1)
To merge this branch: bzr merge lp:~brad-marshall/charms/precise/squid-reverseproxy/http-port-config
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Dave Cheney (community) Approve
Review via email: mp+185204@code.launchpad.net

Description of the change

Made http_port options configurable, and default to port 80

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM.

review: Approve
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

+1 LGTM.

review: Approve
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

Actually it looks like this change has already made it to upstream, this can be closed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2013-01-11 16:49:35 +0000
3+++ config.yaml 2013-09-12 06:17:18 +0000
4@@ -3,6 +3,10 @@
5 type: int
6 default: 3128
7 description: Squid listening port.
8+ port_options:
9+ type: string
10+ default: accel vhost
11+ description: Squid listening port options
12 log_format:
13 type: string
14 default: '%>a %ui %un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh'
15
16=== modified file 'templates/main_config.template'
17--- templates/main_config.template 2013-01-11 16:50:54 +0000
18+++ templates/main_config.template 2013-09-12 06:17:18 +0000
19@@ -1,4 +1,4 @@
20-http_port {{ config.port }} accel vport=443
21+http_port {{ config.port }} {{ config.port_options }}
22
23 acl manager proto cache_object
24 acl localhost src 127.0.0.1/32

Subscribers

People subscribed via source and target branches