Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging

Conflicts:
	config/haproxy-devel/haproxy.inc

3 files changed, 20 insertions, 20 deletions

diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 3df0482a..32a65589 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -96,57 +96,57 @@
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid.inc</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_cache.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_nac.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_nac.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_ng.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_ng.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_traffic.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_traffic.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_upstream.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_upstream.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_auth.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_auth.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_users.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_users.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/sqpmon.sh</item>
+		<item>https://packages.pfsense.org/packages/config/squid/sqpmon.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/squid_cache.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/squid/swapstate_check.php</item>
+		<item>https://packages.pfsense.org/packages/config/squid/swapstate_check.php</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/squid/squid_ng.inc b/config/squid/squid_ng.inc
index cfd2fe66..f96c73e4 100644
--- a/config/squid/squid_ng.inc
+++ b/config/squid/squid_ng.inc
@@ -803,7 +803,7 @@ function custom_php_install_command() {
 		touch("/tmp/custom_php_install_command");
 
 		/*    make sure this all exists, see:
-		 *    http://forum.pfsense.org/index.php?topic=23.msg2391#msg2391
+		 *    https://forum.pfsense.org/index.php?topic=23.msg2391#msg2391
 		 */
 		update_output_window("Setting up Squid environment...");
 		mwexec("mkdir -p /var/squid");
diff --git a/config/squid/squid_ng.xml b/config/squid/squid_ng.xml
index 5d956387..4ff3690c 100644
--- a/config/squid/squid_ng.xml
+++ b/config/squid/squid_ng.xml
@@ -102,42 +102,42 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid/squid_cache.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid/squid_nac.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/squid/squid_nac.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid/squid_ng.inc</item>
+	    <item>https://packages.pfsense.org/packages/config/squid/squid_ng.inc</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid/squid_traffic.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/squid/squid_traffic.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/squid/squid_upstream.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/squid/squid_upstream.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid/squid_auth.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_auth.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid/squid_auth.inc</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_auth.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/squid/squid_extauth.xml</item>
+		<item>https://packages.pfsense.org/packages/config/squid/squid_extauth.xml</item>
 	</additional_files_needed>
 	<fields>	
 		<field>