Skip to content

added and tested under ubuntu1404 append_domain option #43

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

Open
lbayerlein wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added and tested under ubuntu1404 append_domain option #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
$service_ensure = 'running',
$service_enable = $::squid3::params::service_enable,
$service_name = $::squid3::params::service_name,
$append_domain_opt = $::squid3::params::append_domain_opt,
$append_domain = undef,
) inherits ::squid3::params {

$use_template = $template ? {
Expand Down
6 changes: 6 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
}
}

$append_domain_opt = "false"

if $append_domain_opt == 'true' {
$config_append_domain = $append_domain
}

$access_log = [ "${log_directory}/access.log squid" ]
$cache_log = "${log_directory}/cache.log"
$cache_store_log = "${log_directory}/store.log"
Expand Down
3 changes: 3 additions & 0 deletions templates/squid.conf.long.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5213,6 +5213,9 @@ server_persistent_connections <%= @server_persistent_connections %>
#
#Example:
# append_domain .yourdomain.com
<% if @append_domain_opt -%>
append_domain <%= @append_domain %>
<% end -%>
#Default:
# none

Expand Down
4 changes: 4 additions & 0 deletions templates/squid.conf.short.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## THIS FILE IS MANAGED BY PUPPET.
## DO NOT EDIT.

<% if @append_domain_opt -%>
append_domain <%= @append_domain %>
<% end -%>

# predefined ACLs
<% if @use_deprecated_opts -%>
acl manager proto cache_object
Expand Down