diff --git a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml index d28a9ab21..ec89d9682 100644 --- a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml +++ b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml @@ -362,12 +362,14 @@ - 80:http,21:ftp,443:https,70:gopher,210:wais,1025-65535:unregistered ports,280:http-mgmt,488:gss-http,591:filemaker,777:multiling http + 80:http,21:ftp,443:https,70:gopher,210:wais,1025-65535:unregistered ports,280:http-mgmt,488:gss-http,591:filemaker,777:multiling http /^([ \-0-9a-zA-Z:,])*/u Y + 443:https /^([ \-0-9a-zA-Z:,])*/u + Y diff --git a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf index 9574a9ae5..b5e8e9194 100644 --- a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf +++ b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/squid.conf @@ -219,12 +219,9 @@ acl blockmimetypes_requests req_mime_type {{element}} {% endif %} # ACL - SSL ports, default are configured in config.xml -# Configured SSL ports (if defaults are not listed, then they have been removed from the configuration!): -{% if helpers.exists('OPNsense.proxy.forward.acl.sslPorts') %} -{% for element in OPNsense.proxy.forward.acl.sslPorts.split(",") %} +{% for element in OPNsense.proxy.forward.acl.sslPorts.split(",") %} acl SSL_ports port {{element.split(":")[0]}} # {{element.split(":")[1]|default('unknown')}} -{% endfor %} -{% endif %} +{% endfor %} # Default Safe ports are now defined in config.xml # ACL - Safe_ports