Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support forwarded for #137

Merged
merged 4 commits into from
Sep 27, 2019
Merged

support forwarded for #137

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b75719c
support forwarded for
Sep 26, 2019
a66019f
backward compatibility
Sep 26, 2019
00cfdf9
- added changes from review
Sep 27, 2019
ba9bf26
fixed indentation
Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
Optional[String] $cache_replacement_policy = $squid::params::cache_replacement_policy,
Optional[String] $memory_replacement_policy = $squid::params::memory_replacement_policy,
Optional[Boolean] $httpd_suppress_version_string = $squid::params::httpd_suppress_version_string,
Optional[Boolean] $forwarded_for = $squid::params::forwarded_for,
Optional[Variant[Enum['on', 'off', 'transparent', 'delete', 'truncate'], Boolean]]
$forwarded_for = $squid::params::forwarded_for,
Optional[String] $visible_hostname = $squid::params::visible_hostname,
Optional[Boolean] $via = $squid::params::via,
Optional[Hash] $acls = $squid::params::acls,
Expand Down
4 changes: 4 additions & 0 deletions templates/squid.conf.header.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ via <%= @via?'on':'off' %>
httpd_suppress_version_string <%= @httpd_suppress_version_string?'on':'off' %>
<% end -%>
<% unless @forwarded_for.nil? -%>
<% if [true, false].include? @forwarded_for -%>
ekohl marked this conversation as resolved.
Show resolved Hide resolved
forwarded_for <%= @forwarded_for?'on':'off' %>
<% else -%>
ekohl marked this conversation as resolved.
Show resolved Hide resolved
forwarded_for <%= @forwarded_for %>
<% end -%>
<% end -%>

<% if @url_rewrite_program -%>
Expand Down