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 78a2c6d8e30eb1961e3a5b09c20274346a3ad306..3ffcaea1618707828e49e09f135dc913e0788596 100644 (file)
--- 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 232a104fcda3cd7d60d9a78119ff42edd29b0491..c33722443c5acd91da253fb15d3400106439b5b3 100644 (file)
--- 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):