From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Nov 2018 16:16:43 +0000 (+0000)
Subject: CVE Mitre and boot.ipfire.org support HTTPS
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c6aa47ca022668700cf7c81bc615e33e24696f0;p=ipfire.org.git

CVE Mitre and boot.ipfire.org support HTTPS

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/blog.py b/src/backend/blog.py
index 78a2c6d8..3ffcaea1 100644
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -19,7 +19,7 @@ link_patterns = (
 	(re.compile(r"([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)"), r"mailto:\1"),
 
 	# CVE Numbers
-	(re.compile(r"(?:CVE)[\s\-](\d{4}\-\d+)"), r"http://cve.mitre.org/cgi-bin/cvename.cgi?name=\1"),
+	(re.compile(r"(?:CVE)[\s\-](\d{4}\-\d+)"), r"https://cve.mitre.org/cgi-bin/cvename.cgi?name=\1"),
 )
 
 class Blog(misc.Object):
diff --git a/src/web/boot.py b/src/web/boot.py
index 232a104f..c3372244 100644
--- a/src/web/boot.py
+++ b/src/web/boot.py
@@ -66,7 +66,7 @@ class MenuGPXEHandler(BootBaseHandler):
 
 		self.write("set 209:string premenu.cfg?arch=%s&platform=%s\n" \
 			% (self.arch, self.platform))
-		self.write("set 210:string http://boot.ipfire.org/\n")
+		self.write("set 210:string https://boot.ipfire.org/\n")
 		self.write("chain pxelinux.0\n")
 
 	def serve_update(self):