Merge lp:~teward/ubuntu-cdimage/use-relative-css-links into lp:ubuntu-cdimage

[Thomas Ward]

Use relative CSS inlude links instead of releases.u.c hardlinks

Per RT ticket #32732, the Ubuntu Mirrors and web design teams are now using *relative* CSS includes for the CSS stylesheets. This was done so that people running mirrors behind HTTPS:// will be able to properly include the CSS stylesheets without issues, because even if we enforce HTTPS upgrades for includes, we will *not* be able to get https://releases.ubuntu.com/... because there is no HTTPS listener or SSL certificate.

This is why RT ticket #32732 was created, and why the team used relative CSS paths for includes.

However, this is not done for the cdimages' pages CSS which will fail to be included properly and suffer the same problem (which prompted RT ticket #32842). In order for these to properly work for the individual pages on other mirrors, the CSS include paths need to be relative to the mirror's root directory (/include/...) rather than still referring to releases.ubuntu.com (//releases.ubuntu.com/include). With this change in place, the cdimages' HEADER and FOOTER pages for the web page displays will easily be fixed to be compliant with RT ticket #32732.

The branch changes implement changes which allow mirror-root relative includes rather than releases.u.c external required includes to fix the issues observed on HTTPS mirrors.

[Steve Langasek (vorlon)]

No longer applies cleanly against the source, and the source is being moved to git. Please resubmit there.

review: Needs Resubmitting

Unmerged revisions

1762. By Thomas Ward on 2018-11-23

Use relative CSS links instead of hardlinking (RT #32732 and #32842)

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2018-11-06 18:34:26 +0000
+++ lib/cdimage/tests/test_tree.py	2018-11-23 17:25:09 +0000
@@ -317,13 +317,13 @@
         assets = 'https://assets.ubuntu.com/v1'
         for project, expected in (
             ("ubuntu", [assets + "/vanilla-framework-version-1.8.0.min.css"]),
-            ("kubuntu", ["//releases.ubuntu.com/include/kubuntu.css"]),
+            ("kubuntu", ["/include/kubuntu.css"]),
             ("kubuntu-plasma5",
-             ["//releases.ubuntu.com/include/kubuntu-plasma5.css"]),
+             ["/include/kubuntu-plasma5.css"]),
             ("lubuntu",
-             ["//cdimage.ubuntu.com/include/lubuntu/style.css"]),
+             ["/include/lubuntu/style.css"]),
             ("lubuntu-next",
-             ["//cdimage.ubuntu.com/include/lubuntu/style.css"]),
+             ["/include/lubuntu/style.css"]),
         ):
             self.config["PROJECT"] = project
             publisher = Publisher(self.tree, "daily")

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2018-11-12 19:19:26 +0000
+++ lib/cdimage/tree.py	2018-11-23 17:25:09 +0000
@@ -473,11 +473,11 @@
 
     def cssincludes(self):
         if self.project == "kubuntu":
-            return ["//releases.ubuntu.com/include/kubuntu.css"]
+            return ["/include/kubuntu.css"]
         if self.project == "kubuntu-plasma5":
-            return ["//releases.ubuntu.com/include/kubuntu-plasma5.css"]
+            return ["/include/kubuntu-plasma5.css"]
         if self.project in ("lubuntu", "lubuntu-next"):
-            return ["//cdimage.ubuntu.com/include/lubuntu/style.css"]
+            return ["/include/lubuntu/style.css"]
         else:
             return ["https://assets.ubuntu.com/v1/" +
                     "vanilla-framework-version-1.8.0.min.css"]