Add visible_hostname, via, httpd_suppress_version_string and forwarded_for parameters
#81
Conversation
templates/squid.conf.header.erb
Outdated
| <% if @visible_hostname -%> | ||
| visible_hostname <%= @visible_hostname -%> | ||
| <% end -%> | ||
| via <%= (@via == 'on' || @via == true)?'on':'off' %> |
There was a problem hiding this comment.
It can't be on as via is a Boolean.
manifests/params.pp
Outdated
| @@ -7,6 +7,10 @@ | |||
| $ensure_service = 'running' | |||
| $enable_service = true | |||
| $cache_mem = '256 MB' | |||
| $visible_hostname = 'mypc@workgroup' | |||
| $via = true | |||
There was a problem hiding this comment.
This is the default in squid, but perhaps it'd be better to default to undef and not write anything into the configuration file by default.
That way, nothing will break for users who are already setting these options by using extra_config_sections.
manifests/init.pp
Outdated
| @@ -1,6 +1,8 @@ | |||
| class squid ( | |||
| String $access_log = $squid::params::access_log, | |||
| Pattern[/\d+ MB/] $cache_mem = $squid::params::cache_mem, | |||
| Boolean $httpd_suppress_version_string = $squid::params::httpd_suppress_version_string, | |||
There was a problem hiding this comment.
I think these two could also be made Optional[Boolean]?
spec/classes/init_spec.rb
Outdated
| visible_hostname: 'testhost', | ||
| via: 'off', | ||
| httpd_suppress_version_string: 'on', | ||
| forwarded_for: 'off', |
There was a problem hiding this comment.
String off is not a boolean.
|
@SourceDoctor Could you look at the test failures? |
|
@alexjfisher |
spec/classes/init_spec.rb
Outdated
| @@ -32,6 +32,7 @@ | |||
| it { is_expected.to contain_concat_fragment('squid_header').with_content(%r{^access_log\s+daemon:/var/log/#{squid_name}/access.log\s+squid$}) } | |||
| it { is_expected.to contain_concat_fragment('squid_header').with_content(%r{^cache_mem\s+256 MB$}) } | |||
| it { is_expected.to contain_concat_fragment('squid_header').with_content(%r{^maximum_object_size_in_memory\s+512 KB$}) } | |||
|
|
|||
There was a problem hiding this comment.
Unescesary blank line.
traylenator
added
enhancement
README.md
Outdated
| * `visible_hostname` defaults to system hostname. [visible_hostname docs](http://www.squid-cache.org/Doc/config/visible_hostname/) | ||
| * `via` defaults to `on`. [via docs](http://www.squid-cache.org/Doc/config/via/) | ||
| * `httpd_suppress_version_string` defaults to `off`. [httpd_suppress_version_string docs](http://www.squid-cache.org/Doc/config/httpd_suppress_version_string/) | ||
| * `forwarded_for` defaults to `on`. [forwarded_for docs](http://www.squid-cache.org/Doc/config/forwarded_for/) |
There was a problem hiding this comment.
Squid might default to these settings, but the parameters actually default to undef.
templates/squid.conf.header.erb
Outdated
| @@ -39,3 +39,16 @@ workers <%= @workers %> | |||
| <% if @snmp_incoming_address -%> | |||
| snmp_incoming_address <%= @snmp_incoming_address -%> | |||
| <% end -%> | |||
|
|
|||
There was a problem hiding this comment.
Should probably not have this blank line.
templates/squid.conf.header.erb
Outdated
| @@ -39,3 +39,16 @@ workers <%= @workers %> | |||
| <% if @snmp_incoming_address -%> | |||
| snmp_incoming_address <%= @snmp_incoming_address -%> | |||
| <% end -%> | |||
|
|
|||
| <% unless @visible_hostname.nil? -%> | |||
There was a problem hiding this comment.
This parameter isn't a boolean, so the simpler if @visible_hostname would be better.
alexjfisher
changed the title
visible_hostname, via, httpd_suppress_version_string and forwarded_for parameters
|
@SourceDoctor thanks for all the patches. Time a release after that lot. |
set visible_hostname for Error Pages
also configure other visibility Options