Project

General

Profile

Bug #16185

Please deploy ikiwiki po plugin fix from ticket #6907

Added by lamby about 1 year ago. Updated 12 months ago.

Status:
Resolved
Priority:
Normal
Assignee:
-
Category:
-
Target version:
Start date:
12/03/2018
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:
Starter:
Affected tool:

Description

From: https://redmine.tails.boum.org/code/issues/6907

Whilst we don't have an upstream-blessed or upstream-merged patch (yet) we should patch this for our main site. It's silly to not have this fixed and humans seeing it, after all.

I believe we can just patch src:ikiwiki and plonk that in our overlay system (even though we don't ship ikiwiki binaries on the Tails ISO).


Related issues

Related to Tails - Bug #6907: ikiwiki po plugin does not play well with inline directives Resolved 12/03/2018 03/12/2019
Blocks Tails - Feature #15506: Core work 2018Q4: Foundations Team Resolved 04/08/2018

History

#1 Updated by lamby about 1 year ago

  • Subject changed from Please deploy ikiwiki po plugin fix from to Please deploy ikiwiki po plugin fix from ticket #6907

#2 Updated by intrigeri about 1 year ago

  • Assignee changed from intrigeri to lamby
  • QA Check set to Info Needed

I believe we can just patch src:ikiwiki and plonk that in our overlay system (even though we don't ship ikiwiki binaries on the Tails ISO).

What matters is our production website (https://tails.boum.org/). It's built using the system ikiwiki in a Debian Stretch VM on one of our servers. So I don't understand what overlay system you're talking about. Maybe you're confusing the problem we need to solve with "fixing the ikiwiki used to build the local copy of our website that's included in our ISO" (AFAIK that one was never affected by the bug so we don't care).

Anyway, here's a plan I like:

  1. create an APT suite for this custom package: I'll do this
  2. create a Vcs-Git for this custom package: either of us can host it wherever they want, or ask for a repo
  3. prepare a patched package in that Vcs-Git: either of us can do it
  4. build and upload to that new APT suite: I'll do it
  5. ensure the webserver pulls that package from that APT suite: I'll write these few Puppet lines

OK?

I'm not sure if it's worth splitting the work and I'm fine doing all these steps myself.

Alternatively we could switch to running ikiwiki from a local checkout of the branch that has the fix; that's more initial sysadmin work but less recurring costs. I'm confident #6907 will be solved upstream rather quickly once we have automated tests for it, so I'm inclined to optimize for "less initial sysadmin work" over "less recurring costs".

#3 Updated by lamby about 1 year ago

  • Assignee changed from lamby to intrigeri

intrigeri wrote:

I don't understand what overlay system you're talking about.

The one where we host/store, etc. all our other patched Debian packages. :)

Maybe you're confusing the problem we need to solve with "fixing the ikiwiki used to build the local copy of our website that's included in our ISO" (AFAIK that one was never affected by the bug so we don't care).

(It's not? Why not?)

Anyway, here's a plan I like:

[…]

I'm not sure if it's worth splitting the work and I'm fine doing all these steps myself.

Hm, no I don't think it is worth splitting this given that I can see at least 2 or 3 places where we will have to play ticket tag which is just a lot of needless context-switching for us both and I wouldn't "even" be learning much from the experience.

#4 Updated by intrigeri about 1 year ago

  • Status changed from New to Confirmed
  • Target version set to Tails_3.11

I don't understand what overlay system you're talking about.

The one where we host/store, etc. all our other patched Debian packages. :)

Aaaah, sorry I totally misunderstood then :)

Maybe you're confusing the problem we need to solve with "fixing the ikiwiki used to build the local copy of our website that's included in our ISO" (AFAIK that one was never affected by the bug so we don't care).

(It's not? Why not?)

(Either it's never been affected or it was never problematic enough for anyone to report it: the incentive to browse the offline version of the parts of our website that are affected is extremely low. I can think of a few plausible technical explanations but it's probably not worth spending time writing them down at this point.)

Hm, no I don't think it is worth splitting this given that I can see at least 2 or 3 places where we will have to play ticket tag which is just a lot of needless context-switching for us both and I wouldn't "even" be learning much from the experience.

ACK. I'll try to get this done in time for the 3.11 release (releases are the kinds of push events that typically trigger the bug more than other operations) and worst case, for 3.12.

Thanks!

#5 Updated by intrigeri about 1 year ago

  • QA Check deleted (Info Needed)

#6 Updated by intrigeri about 1 year ago

#7 Updated by intrigeri about 1 year ago

  • Status changed from Confirmed to Resolved
  • Assignee deleted (intrigeri)
  • % Done changed from 0 to 100
  • Type of work changed from Sysadmin to Code

intrigeri wrote:

  1. create an APT suite for this custom package: I'll do this
  2. create a Vcs-Git for this custom package: either of us can host it wherever they want, or ask for a repo
  3. prepare a patched package in that Vcs-Git: either of us can do it
  4. build and upload to that new APT suite: I'll do it
  5. ensure the webserver pulls that package from that APT suite: I'll write these few Puppet lines

Done. I've forked the package off the version that's in Stretch, given it a version number smaller than any security or stable p-u upload, and pinned the APT source to the same level as stretch* so that we prioritize security fixes over keeping our delta; then I've subscribed to the relevant keywords on the Debian package tracker so I am notified if there's an update in stretch* and I must rebase our package on top of it. With all this in place, IMO it's not worth setting up a dedicated process to keep this package up-to-date. Pushed the packaging to git.tails.boum.org:ikiwiki.

#8 Updated by intrigeri 12 months ago

  • Parent task deleted (#6907)

#9 Updated by intrigeri 12 months ago

  • Related to Bug #6907: ikiwiki po plugin does not play well with inline directives added

Also available in: Atom PDF