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

Conflicts:
	config/haproxy-devel/haproxy.inc

3 files changed, 12 insertions, 12 deletions

diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index 651b79b2..aa602fdd 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -736,31 +736,31 @@ function vhosts_install_command() {
 	if(stristr(php_uname('r'), '7.2') == TRUE) {
 		if (!file_exists('/usr/local/php5')) {
 			chdir('/usr/local/');
-			exec ("fetch http://files.pfsense.org/packages/7/vhosts/php5.tar.gz");
+			exec ("fetch https://files.pfsense.org/packages/7/vhosts/php5.tar.gz");
 			exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
 			exec("rm /usr/local/php5.tar.gz");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.so.5')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so.5");
+			exec ("fetch https://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so.5");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.so')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so");
+			exec ("fetch https://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.la')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.la");
+			exec ("fetch https://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.la");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.a')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/lib/libxml2.a");
+			exec ("fetch https://files.pfsense.org/packages/7/vhosts/usr.local.lib/lib/libxml2.a");
 		}
 	}
 	if(stristr(php_uname('r'), '8.1') == TRUE) {
 		if (!file_exists('/usr/local/php5')) {
 			chdir('/usr/local/');
-			exec ("fetch http://files.pfsense.org/packages/8/vhosts/php5.tar.gz");
+			exec ("fetch https://files.pfsense.org/packages/8/vhosts/php5.tar.gz");
 			exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
 			exec("rm /usr/local/php5.tar.gz");
 		}
@@ -774,7 +774,7 @@ function vhosts_install_command() {
 	unlink_if_exists("/tmp/vhosts_php_edit.tmp");
 
 	chdir('/tmp/');
-	exec ("fetch http://www.pfsense.com/packages/config/vhosts/system_advanced_create_certs.tmp");
+	exec ("fetch https://packages.pfsense.org/packages/config/vhosts/system_advanced_create_certs.tmp");
 	exec("cp /tmp/system_advanced_create_certs.tmp /usr/local/www/packages/vhosts/system_advanced_create_certs.php");
 	unlink_if_exists("/tmp/system_advanced_create_certs.tmp");
 
diff --git a/config/vhosts/vhosts.xml b/config/vhosts/vhosts.xml
index 9bfb73e0..91c50079 100644
--- a/config/vhosts/vhosts.xml
+++ b/config/vhosts/vhosts.xml
@@ -73,22 +73,22 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/vhosts/vhosts.xml</item>
+		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/vhosts/vhosts.inc</item>
+		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/vhosts/vhosts_php.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts_php.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/vhosts/vhosts_php_edit.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts_php_edit.tmp</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/vhosts/vhosts_php.tmp b/config/vhosts/vhosts_php.tmp
index 09b20ef7..d2777dc9 100644
--- a/config/vhosts/vhosts_php.tmp
+++ b/config/vhosts/vhosts_php.tmp
@@ -82,7 +82,7 @@ include("head.inc");
 				System -> Advanced -> Enable Secure Shell. Then SFTP can be used to access the files at /usr/local/vhosts.
 				After adding or updating an entry make sure to restart the <a href='/status_services.php'>service</a> to apply the settings.
 				<br /><br />
-				For more information see: <a href='http://doc.pfsense.org/index.php/vhosts'>http://doc.pfsense.org/index.php/vhosts</a>            
+				For more information see: <a href='https://doc.pfsense.org/index.php/vhosts'>https://doc.pfsense.org/index.php/vhosts</a>            
 				</p></td>
 			</tr>
 		</table>