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

Conflicts:
	config/haproxy-devel/haproxy.inc

5 files changed, 14 insertions, 14 deletions

diff --git a/config/zebedee/zebedee.xml b/config/zebedee/zebedee.xml
index b56fa1a6..db7bfddf 100644
--- a/config/zebedee/zebedee.xml
+++ b/config/zebedee/zebedee.xml
@@ -62,52 +62,52 @@
 		<description>Tunneling Service</description>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee.inc</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_tunnels.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_tunnels.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_key_details.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_key_details.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_sync.xml</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_del_key.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_del_key.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_get_key.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_get_key.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_keys.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_keys.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_log.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_log.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed> 
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee_view_config.php</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee_view_config.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/zebedee/zebedee.sh</item>
+		<item>https://packages.pfsense.org/packages/config/zebedee/zebedee.sh</item>
 		<prefix>/usr/local/etc/rc.d/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
diff --git a/config/zebedee/zebedee_del_key.php b/config/zebedee/zebedee_del_key.php
index e6cfa955..49688fd3 100644
--- a/config/zebedee/zebedee_del_key.php
+++ b/config/zebedee/zebedee_del_key.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	zebedee_del_key.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2010 Marcello Coutinho
 	Copyright (C) 2010 Jorge Lustosa
diff --git a/config/zebedee/zebedee_keys.php b/config/zebedee/zebedee_keys.php
index 14b39078..1ff7d06e 100644
--- a/config/zebedee/zebedee_keys.php
+++ b/config/zebedee/zebedee_keys.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	zebedee_keys.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	Copyright (C) 2010 Marcello Coutinho
 	Copyright (C) 2010 Jorge Lustosa
diff --git a/config/zebedee/zebedee_log.php b/config/zebedee/zebedee_log.php
index e397ca08..784ad93e 100644
--- a/config/zebedee/zebedee_log.php
+++ b/config/zebedee/zebedee_log.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnishstat_view_logs.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.
 
diff --git a/config/zebedee/zebedee_view_config.php b/config/zebedee/zebedee_view_config.php
index 78a0bca9..1d57d8eb 100644
--- a/config/zebedee/zebedee_view_config.php
+++ b/config/zebedee/zebedee_view_config.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnish_view_config.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.