Merge lp:~michael.nelson/charms/trusty/squid-reverseproxy/add-max-obj-size-mem into lp:charms/trusty/squid-reverseproxy

[Michael Nelson]

Add max_obj_size_in_mem_kb option. Bug 1474176

Tested locally with:

$ juju ssh sca-cache/0 "sudo cat /etc/squid3/squid.conf | grep maximum_object"
maximum_object_size 8192 KB

$ make manifests/upgrade-deployment
...
########################
# Succesfully verified #
########################
########################
# Nagios Checks Passed #
########################

$ juju ssh sca-cache/0 "sudo cat /etc/squid3/squid.conf | grep maximum_object"
maximum_object_size 8192 KB
maximum_object_size_in_memory 512 KB

[Charles Butler (lazypower)]

+1 LGTM. Thank you for taking the time to submit this fix for the charm store. We appreciate your work. I've merged this branch and it should be available in the charm store after the next ingestion.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>, or ask a question tagged with "juju" on http://askubuntu.com.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-05-02 15:23:33 +0000
+++ config.yaml	2015-07-14 03:05:30 +0000
@@ -73,6 +73,10 @@
     type: int
     default: 8192
     description: Maximum size of an object to be cached (KB).
+  max_obj_size_in_mem_kb:
+    type: int
+    default: 512
+    description: Maximum size of an object to be cached in memory (KB).
   snmp_community:
     type: string
     default: ''
 
=== modified file 'templates/main_config.template'
--- templates/main_config.template	2015-05-13 04:42:30 +0000
+++ templates/main_config.template	2015-07-14 03:05:30 +0000
@@ -35,6 +35,7 @@
 
 coredump_dir {{ config.cache_dir }}
 maximum_object_size {{ config.max_obj_size_kb }} KB
+maximum_object_size_in_memory {{ config.max_obj_size_in_mem_kb }} KB
 
 {% if config.cache_size_mb > 0 -%}
 cache_dir aufs {{ config.cache_dir }} {{ config.cache_size_mb }} {{ config.cache_l1 }} {{ config.cache_l2 }}