Skip to content

Simple fix #63

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
abraham1901 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simple fix #63

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
6 changes: 4 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
$server_persistent_connections = 'on',
$maximum_object_size = '4096 KB',
$maximum_object_size_in_memory = '512 KB',
$config_array_prepend = false,
$config_array = false,
$config_hash_prepend = false,
$config_hash = false,
$config_content = undef,
$config_source = undef,
Expand Down Expand Up @@ -78,8 +80,8 @@
}

case $::osfamily {
'FreeBSD': { $cmdpath = "/usr/local/sbin" }
default: { $cmdpath = "/usr/sbin" }
'FreeBSD': { $cmdpath = '/usr/local/sbin' }
default: { $cmdpath = '/usr/sbin' }
}

file { $config_file:
Expand Down
10 changes: 6 additions & 4 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"project_page": "https://github.com/thias/puppet-squid3",
"issues_url": "https://github.com/thias/puppet-squid3/issues",
"tags": [ "squid", "proxy" ],
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 5.0.0 < 7.0.0"
}
],
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
Expand All @@ -30,10 +36,6 @@
{
"name": "puppet",
"version_requirement": ">=2.7.20 <7.0.0"
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 2.4.0"
}
]
}
12 changes: 12 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,18 @@
## THIS FILE IS MANAGED BY PUPPET.
## DO NOT EDIT.

# user-defined configuration settings from config_hash_prepend
<% if @config_hash_prepend -%>
<% @config_hash_prepend.sort_by {|k,v| k}.each do |k,v| -%>
<%= "%*s"%[-30,k] %> <%= v %>
<% end -%>
<% end -%>
<% if @config_array_prepend -%>
<% @config_array_prepend.each do |v| -%>
<%= v %>
<% end -%>
<% end -%>

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