From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 2 Jan 2020 16:12:35 +0000 (+0000)
Subject: pakfire: use HTTPS if no protocol is specified
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c846ed161682adfd7a9939d7778ce28b6f677d71;p=people%2Fms%2Fipfire-2.x.git

pakfire: use HTTPS if no protocol is specified

also use HTTPS on fallback to mainserver if no mirror was left

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 80c52449b3..181ef8cf48 100644
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -5,4 +5,5 @@ var/ipfire/langs
 etc/rc.d/init.d/networking/red.up/06-safe-search
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/suricata
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 460eaf303c..61787757eb 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -144,7 +144,7 @@ sub fetchfile {
 			$file = $getfile;
 		}
 		
-		$proto = "HTTP" unless $proto;
+		$proto = "HTTPS" unless $proto;
 		
 		logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
 
@@ -318,7 +318,7 @@ sub selectmirror {
 
 	if ($scount eq 0) {
 		logger("MIRROR INFO: Could not find any servers. Falling back to main server $Conf::mainserver");
-		return ("HTTP", $Conf::mainserver, "/$Conf::version");
+		return ("HTTPS", $Conf::mainserver, "/$Conf::version");
 	}
 
 	### Choose a random server and test if it is online