From 559a4c30e8dcea867fe7a4f865b769f887e603ae Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Fri, 9 Aug 2024 07:33:00 +0530 Subject: [PATCH] featherwiki: Proxy download through freedombox.org This serves two purposes: 1. Upstream's website cannot track the IP addresses of FreedomBox users. 2. We can update the versions of the empty quine files without making code changes in FreedomBox. Signed-off-by: Joseph Nuthalapati [sunil: Update description to reflect the change in upstream URL] Signed-off-by: Sunil Mohan Adapa g Reviewed-by: Sunil Mohan Adapa --- plinth/modules/featherwiki/__init__.py | 6 ++++-- plinth/modules/featherwiki/privileged.py | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plinth/modules/featherwiki/__init__.py b/plinth/modules/featherwiki/__init__.py index 0a7120438..eb6eeb9e9 100644 --- a/plinth/modules/featherwiki/__init__.py +++ b/plinth/modules/featherwiki/__init__.py @@ -29,8 +29,10 @@ _description = [ _('Each wiki is a small file. Create as many wikis as you like, such as ' 'one wiki per topic. Customize each wiki to your liking with extensions ' 'and other customization options.'), - _('Feather Wiki is downloaded from upstream website and not from Debian. ' - 'Wikis need to be upgraded to newer version manually.'), + format_lazy( + _('Feather Wiki is downloaded from {box_name} website and not from ' + 'Debian. Wikis need to be upgraded to newer version manually.'), + box_name=_(cfg.box_name)), format_lazy( _('Wikis are not public by default, but they can be downloaded for ' 'sharing or publishing. They can be edited by ' diff --git a/plinth/modules/featherwiki/privileged.py b/plinth/modules/featherwiki/privileged.py index f29373049..aac342b16 100644 --- a/plinth/modules/featherwiki/privileged.py +++ b/plinth/modules/featherwiki/privileged.py @@ -9,8 +9,7 @@ import urllib.request from plinth.actions import privileged -# Needs to be changed on a new release -EMPTY_WIKI_FILE = 'https://feather.wiki/builds/v1.8.x/FeatherWiki_Skylark.html' +EMPTY_WIKI_FILE = 'https://ftp.freedombox.org/pub/featherwiki/empty.html' wiki_dir = pathlib.Path('/var/lib/featherwiki')