Merge pull request #1 from thias/master

Merge thias/puppet-squid3 changes

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fix cache_dir in short template, must be below maximum_object_size.
+
 #### 2015-11-16 - 1.0.0
 * Add FreeBSD support (#11, @misullivan).
 * Add version parameter to set squid package version (#12, @actionjack).

templates/squid.conf.short.erb

@@ -76,11 +76,6 @@ https_port <%= line %>
 tcp_outgoing_address <%= line %>
 <% end -%>
 
-# user-defined cache-dirs
-<% @cache_dir.each do |line| -%>
-cache_dir <%= line %>
-<% end -%>
-
 
 # general settings
 hierarchy_stoplist             cgi-bin ?
@@ -113,6 +108,11 @@ refresh_pattern                -i (/cgi-bin/|\?)     0     0%        0
 refresh_pattern                .                     0    20%     4320
 
 
+# user-defined cache-dirs
+<% @cache_dir.each do |line| -%>
+cache_dir <%= line %>
+<% end -%>
+
 # user-defined configuration settings from config_hash
 <% @config_hash.sort_by {|k,v| k}.each do |k,v| -%>
 <%= "%*s"%[-30,k] %> <%= v %>