diff --git a/manifests/init.pp b/manifests/init.pp index b8e1157..39673a6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,14 +3,16 @@ class squid3 ( # Options are in the same order they appear in squid.conf $auth_params = [], - $use_deprecated_opts = true, + $use_deprecated_opts = false, $use_default_localnet = true, $http_port = [ '3128' ], $https_port = [], + $snmp_port = [], $acl = [], $ssl_ports = [ '443' ], $safe_ports = [ '80', '21', '443', '70', '210', '1025-65535', '280', '488', '591', '777', ], $http_access = [], + $snmp_access = [], $icp_access = [], $tcp_outgoing_address = [], $cache_mem = '256 MB', diff --git a/manifests/params.pp b/manifests/params.pp index 41eca8f..ac25873 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -16,7 +16,8 @@ $coredump_dir = '/var/spool/squid' } 'Debian': { - if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'16.04') >= 0 { + if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease,'16.04') >= 0) or + ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease,'11') >= 0) { $package_name = 'squid' $service_name = 'squid' $service_enable = false diff --git a/templates/squid.conf.long.erb b/templates/squid.conf.long.erb index 7d3c0c1..9377516 100644 --- a/templates/squid.conf.long.erb +++ b/templates/squid.conf.long.erb @@ -4091,6 +4091,9 @@ server_persistent_connections <%= @server_persistent_connections %> # snmp_port 3401 #Default: # snmp_port 0 +<% @snmp_port.each do |line| -%> +snmp_port <%= line %> +<% end -%> # TAG: snmp_access # Allowing or denying access to the SNMP port. @@ -4107,6 +4110,10 @@ server_persistent_connections <%= @server_persistent_connections %> # snmp_access deny all #Default: # snmp_access deny all +<% @snmp_access.each do |line| -%> +snmp_access <%= line %> +<% end -%> +snmp_access deny all # TAG: snmp_incoming_address # TAG: snmp_outgoing_address diff --git a/templates/squid.conf.short.erb b/templates/squid.conf.short.erb index 185e063..62b3cf5 100644 --- a/templates/squid.conf.short.erb +++ b/templates/squid.conf.short.erb @@ -46,6 +46,12 @@ http_access allow localnet http_access allow localhost http_access deny all +# user-defined snmp_accesses +<% @snmp_access.each do |line| -%> +snmp_access <%= line %> +<% end -%> +snmp_access deny all + # user-defined icp_access <% @icp_access.each do |line| -%> icp_access <%= line %> @@ -58,6 +64,13 @@ http_port <%= line %> <% end -%> <% end -%> +<% if @snmp_port -%> +# user-defined snmp_port +<% @snmp_port.each do |line| -%> +snmp_port <%= line %> +<% end -%> +<% end -%> + <% if @https_port -%> # user-defined https_port <% @https_port.each do |line| -%>