From 9133711bafd580a3ad586b92f0c769c57d7a9847 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 23 Nov 2021 11:59:49 -0800 Subject: [PATCH] dynamicdns: Update URLs to the new dynamic DNS server By December 15th, all freedomboxes should no longer be pointing to the old server. Hence, we need to have these changes done much before the migration date for the changes to propagate. The new website ddns.freedombox.org does not allow registrations yet. However, the new website has a link to announcement. There is now an advice for new users seeking to create accounts during the migration period. Tests: - In Dynamic DNS app, in the about page, the link is to the new server and it works. - The example link in the configuration form, IP URL field description is to new server and it works. - Functional tests for the Dynamic DNS app work. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/dynamicdns/forms.py | 2 +- plinth/modules/dynamicdns/templates/dynamicdns.html | 4 ++-- plinth/modules/dynamicdns/tests/test_functional.py | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plinth/modules/dynamicdns/forms.py b/plinth/modules/dynamicdns/forms.py index 3f2bf1b4c..60454a9df 100644 --- a/plinth/modules/dynamicdns/forms.py +++ b/plinth/modules/dynamicdns/forms.py @@ -56,7 +56,7 @@ class ConfigureForm(forms.Form): 'router) this URL is used to determine the real ' 'IP address. The URL should simply return the IP where ' 'the client comes from (example: ' - 'http://myip.datasystems24.de).'), + 'https://ddns.freedombox.org/ip/).'), box_name=gettext_lazy(cfg.box_name)) help_user = \ gettext_lazy('The username that was used when the account was ' diff --git a/plinth/modules/dynamicdns/templates/dynamicdns.html b/plinth/modules/dynamicdns/templates/dynamicdns.html index 1f10b3c5e..0584be5cc 100644 --- a/plinth/modules/dynamicdns/templates/dynamicdns.html +++ b/plinth/modules/dynamicdns/templates/dynamicdns.html @@ -11,8 +11,8 @@

{% blocktrans trimmed %} If you are looking for a free dynamic DNS account, you may find - a free GnuDIP service at gnudip.datasystems24.net or you may find + a free GnuDIP service at ddns.freedombox.org or you may find free update URL based services at freedns.afraid.org. diff --git a/plinth/modules/dynamicdns/tests/test_functional.py b/plinth/modules/dynamicdns/tests/test_functional.py index ceee92ea8..a6064e97a 100644 --- a/plinth/modules/dynamicdns/tests/test_functional.py +++ b/plinth/modules/dynamicdns/tests/test_functional.py @@ -6,6 +6,7 @@ Functional, browser based tests for dynamicdns app. import time import pytest + from plinth.tests import functional pytestmark = [ @@ -55,7 +56,7 @@ def _configure(browser): browser.find_by_id('id_dynamicdns_user').fill('tester') browser.find_by_id('id_dynamicdns_secret').fill('testingtesting') browser.find_by_id('id_dynamicdns_ipurl').fill( - 'http://myip.datasystems24.de') + 'https://ddns.freedombox.org/ip/') functional.submit(browser) # After a domain name change, Let's Encrypt will restart the web @@ -76,7 +77,7 @@ def _has_original_config(browser): ipurl = browser.find_by_id('id_dynamicdns_ipurl').value if enabled and service_type == 'GnuDIP' and server == 'example.com' \ and domain == 'freedombox.example.com' and user == 'tester' \ - and ipurl == 'http://myip.datasystems24.de': + and ipurl == 'https://ddns.freedombox.org/ip/': return True else: return False @@ -93,7 +94,7 @@ def _change_config(browser): browser.find_by_id('id_dynamicdns_user').fill('tester2') browser.find_by_id('id_dynamicdns_secret').fill('testingtesting2') browser.find_by_id('id_dynamicdns_ipurl').fill( - 'http://myip2.datasystems24.de') + 'https://ddns2.freedombox.org/ip/') functional.submit(browser) # After a domain name change, Let's Encrypt will restart the web