diff --git a/www/squid/Makefile b/www/squid/Makefile index c554a7870..6e9236529 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= squid -PLUGIN_VERSION= 1.2 -PLUGIN_REVISION= 3 +PLUGIN_VERSION= 1.3 PLUGIN_COMMENT= Squid is a caching proxy for the web PLUGIN_DEPENDS= squid squid-langpack PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/www/squid/contrib/Makefile b/www/squid/contrib/Makefile new file mode 100644 index 000000000..15529e4b4 --- /dev/null +++ b/www/squid/contrib/Makefile @@ -0,0 +1,5 @@ +PLUGIN_CONTRIB= template_error_pages + +ROOT_template_error_pages= /usr/local/opnsense/data/proxy + +.include "../../../Mk/contrib.mk" diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ACCESS_DENIED.html b/www/squid/contrib/template_error_pages/ERR_ACCESS_DENIED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ACCESS_DENIED.html rename to www/squid/contrib/template_error_pages/ERR_ACCESS_DENIED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ACL_TIME_QUOTA_EXCEEDED.html b/www/squid/contrib/template_error_pages/ERR_ACL_TIME_QUOTA_EXCEEDED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ACL_TIME_QUOTA_EXCEEDED.html rename to www/squid/contrib/template_error_pages/ERR_ACL_TIME_QUOTA_EXCEEDED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_AGENT_CONFIGURE.html b/www/squid/contrib/template_error_pages/ERR_AGENT_CONFIGURE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_AGENT_CONFIGURE.html rename to www/squid/contrib/template_error_pages/ERR_AGENT_CONFIGURE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_AGENT_WPAD.html b/www/squid/contrib/template_error_pages/ERR_AGENT_WPAD.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_AGENT_WPAD.html rename to www/squid/contrib/template_error_pages/ERR_AGENT_WPAD.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CACHE_ACCESS_DENIED.html b/www/squid/contrib/template_error_pages/ERR_CACHE_ACCESS_DENIED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CACHE_ACCESS_DENIED.html rename to www/squid/contrib/template_error_pages/ERR_CACHE_ACCESS_DENIED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CACHE_MGR_ACCESS_DENIED.html b/www/squid/contrib/template_error_pages/ERR_CACHE_MGR_ACCESS_DENIED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CACHE_MGR_ACCESS_DENIED.html rename to www/squid/contrib/template_error_pages/ERR_CACHE_MGR_ACCESS_DENIED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CANNOT_FORWARD.html b/www/squid/contrib/template_error_pages/ERR_CANNOT_FORWARD.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CANNOT_FORWARD.html rename to www/squid/contrib/template_error_pages/ERR_CANNOT_FORWARD.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CONFLICT_HOST.html b/www/squid/contrib/template_error_pages/ERR_CONFLICT_HOST.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CONFLICT_HOST.html rename to www/squid/contrib/template_error_pages/ERR_CONFLICT_HOST.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CONNECT_FAIL.html b/www/squid/contrib/template_error_pages/ERR_CONNECT_FAIL.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_CONNECT_FAIL.html rename to www/squid/contrib/template_error_pages/ERR_CONNECT_FAIL.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_DIR_LISTING.html b/www/squid/contrib/template_error_pages/ERR_DIR_LISTING.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_DIR_LISTING.html rename to www/squid/contrib/template_error_pages/ERR_DIR_LISTING.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_DNS_FAIL.html b/www/squid/contrib/template_error_pages/ERR_DNS_FAIL.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_DNS_FAIL.html rename to www/squid/contrib/template_error_pages/ERR_DNS_FAIL.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ESI.html b/www/squid/contrib/template_error_pages/ERR_ESI.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ESI.html rename to www/squid/contrib/template_error_pages/ERR_ESI.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FORWARDING_DENIED.html b/www/squid/contrib/template_error_pages/ERR_FORWARDING_DENIED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FORWARDING_DENIED.html rename to www/squid/contrib/template_error_pages/ERR_FORWARDING_DENIED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_DISABLED.html b/www/squid/contrib/template_error_pages/ERR_FTP_DISABLED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_DISABLED.html rename to www/squid/contrib/template_error_pages/ERR_FTP_DISABLED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_FAILURE.html b/www/squid/contrib/template_error_pages/ERR_FTP_FAILURE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_FAILURE.html rename to www/squid/contrib/template_error_pages/ERR_FTP_FAILURE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_FORBIDDEN.html b/www/squid/contrib/template_error_pages/ERR_FTP_FORBIDDEN.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_FORBIDDEN.html rename to www/squid/contrib/template_error_pages/ERR_FTP_FORBIDDEN.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_NOT_FOUND.html b/www/squid/contrib/template_error_pages/ERR_FTP_NOT_FOUND.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_NOT_FOUND.html rename to www/squid/contrib/template_error_pages/ERR_FTP_NOT_FOUND.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_CREATED.html b/www/squid/contrib/template_error_pages/ERR_FTP_PUT_CREATED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_CREATED.html rename to www/squid/contrib/template_error_pages/ERR_FTP_PUT_CREATED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_ERROR.html b/www/squid/contrib/template_error_pages/ERR_FTP_PUT_ERROR.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_ERROR.html rename to www/squid/contrib/template_error_pages/ERR_FTP_PUT_ERROR.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_MODIFIED.html b/www/squid/contrib/template_error_pages/ERR_FTP_PUT_MODIFIED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_PUT_MODIFIED.html rename to www/squid/contrib/template_error_pages/ERR_FTP_PUT_MODIFIED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_UNAVAILABLE.html b/www/squid/contrib/template_error_pages/ERR_FTP_UNAVAILABLE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_FTP_UNAVAILABLE.html rename to www/squid/contrib/template_error_pages/ERR_FTP_UNAVAILABLE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_GATEWAY_FAILURE.html b/www/squid/contrib/template_error_pages/ERR_GATEWAY_FAILURE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_GATEWAY_FAILURE.html rename to www/squid/contrib/template_error_pages/ERR_GATEWAY_FAILURE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ICAP_FAILURE.html b/www/squid/contrib/template_error_pages/ERR_ICAP_FAILURE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ICAP_FAILURE.html rename to www/squid/contrib/template_error_pages/ERR_ICAP_FAILURE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_REQ.html b/www/squid/contrib/template_error_pages/ERR_INVALID_REQ.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_REQ.html rename to www/squid/contrib/template_error_pages/ERR_INVALID_REQ.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_RESP.html b/www/squid/contrib/template_error_pages/ERR_INVALID_RESP.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_RESP.html rename to www/squid/contrib/template_error_pages/ERR_INVALID_RESP.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_URL.html b/www/squid/contrib/template_error_pages/ERR_INVALID_URL.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_INVALID_URL.html rename to www/squid/contrib/template_error_pages/ERR_INVALID_URL.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_LIFETIME_EXP.html b/www/squid/contrib/template_error_pages/ERR_LIFETIME_EXP.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_LIFETIME_EXP.html rename to www/squid/contrib/template_error_pages/ERR_LIFETIME_EXP.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_NO_RELAY.html b/www/squid/contrib/template_error_pages/ERR_NO_RELAY.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_NO_RELAY.html rename to www/squid/contrib/template_error_pages/ERR_NO_RELAY.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ONLY_IF_CACHED_MISS.html b/www/squid/contrib/template_error_pages/ERR_ONLY_IF_CACHED_MISS.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ONLY_IF_CACHED_MISS.html rename to www/squid/contrib/template_error_pages/ERR_ONLY_IF_CACHED_MISS.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_PRECONDITION_FAILED.html b/www/squid/contrib/template_error_pages/ERR_PRECONDITION_FAILED.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_PRECONDITION_FAILED.html rename to www/squid/contrib/template_error_pages/ERR_PRECONDITION_FAILED.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_PROTOCOL_UNKNOWN.html b/www/squid/contrib/template_error_pages/ERR_PROTOCOL_UNKNOWN.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_PROTOCOL_UNKNOWN.html rename to www/squid/contrib/template_error_pages/ERR_PROTOCOL_UNKNOWN.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_READ_ERROR.html b/www/squid/contrib/template_error_pages/ERR_READ_ERROR.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_READ_ERROR.html rename to www/squid/contrib/template_error_pages/ERR_READ_ERROR.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_READ_TIMEOUT.html b/www/squid/contrib/template_error_pages/ERR_READ_TIMEOUT.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_READ_TIMEOUT.html rename to www/squid/contrib/template_error_pages/ERR_READ_TIMEOUT.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SECURE_CONNECT_FAIL.html b/www/squid/contrib/template_error_pages/ERR_SECURE_CONNECT_FAIL.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SECURE_CONNECT_FAIL.html rename to www/squid/contrib/template_error_pages/ERR_SECURE_CONNECT_FAIL.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SHUTTING_DOWN.html b/www/squid/contrib/template_error_pages/ERR_SHUTTING_DOWN.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SHUTTING_DOWN.html rename to www/squid/contrib/template_error_pages/ERR_SHUTTING_DOWN.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SOCKET_FAILURE.html b/www/squid/contrib/template_error_pages/ERR_SOCKET_FAILURE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_SOCKET_FAILURE.html rename to www/squid/contrib/template_error_pages/ERR_SOCKET_FAILURE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_TOO_BIG.html b/www/squid/contrib/template_error_pages/ERR_TOO_BIG.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_TOO_BIG.html rename to www/squid/contrib/template_error_pages/ERR_TOO_BIG.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_UNSUP_HTTPVERSION.html b/www/squid/contrib/template_error_pages/ERR_UNSUP_HTTPVERSION.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_UNSUP_HTTPVERSION.html rename to www/squid/contrib/template_error_pages/ERR_UNSUP_HTTPVERSION.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_UNSUP_REQ.html b/www/squid/contrib/template_error_pages/ERR_UNSUP_REQ.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_UNSUP_REQ.html rename to www/squid/contrib/template_error_pages/ERR_UNSUP_REQ.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_URN_RESOLVE.html b/www/squid/contrib/template_error_pages/ERR_URN_RESOLVE.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_URN_RESOLVE.html rename to www/squid/contrib/template_error_pages/ERR_URN_RESOLVE.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_WRITE_ERROR.html b/www/squid/contrib/template_error_pages/ERR_WRITE_ERROR.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_WRITE_ERROR.html rename to www/squid/contrib/template_error_pages/ERR_WRITE_ERROR.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ZERO_SIZE_OBJECT.html b/www/squid/contrib/template_error_pages/ERR_ZERO_SIZE_OBJECT.html similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/ERR_ZERO_SIZE_OBJECT.html rename to www/squid/contrib/template_error_pages/ERR_ZERO_SIZE_OBJECT.html diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/error-details.txt b/www/squid/contrib/template_error_pages/error-details.txt similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/error-details.txt rename to www/squid/contrib/template_error_pages/error-details.txt diff --git a/www/squid/src/opnsense/data/proxy/template_error_pages/errorpage.css b/www/squid/contrib/template_error_pages/errorpage.css similarity index 100% rename from www/squid/src/opnsense/data/proxy/template_error_pages/errorpage.css rename to www/squid/contrib/template_error_pages/errorpage.css