From eaa6c280c0f76e983da9c69f1143fe16368379c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 19 Oct 2024 10:38:55 +0200 Subject: [PATCH] Use the new repo.yunohost.org debian repository --- helpers/helpers.v1.d/apt | 4 ++-- src/migrations/0027_migrate_to_bookworm.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/helpers.v1.d/apt b/helpers/helpers.v1.d/apt index dbe5c057e5..89e3231e54 100644 --- a/helpers/helpers.v1.d/apt +++ b/helpers/helpers.v1.d/apt @@ -558,9 +558,9 @@ ynh_remove_extra_repo() { # | arg: -a, --append - Do not overwrite existing files. # | arg: -t, --trusted - Add trusted=yes to the repository (not recommended) # -# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable +# Example for a repo like deb http://repo.yunohost.org/debian/ stretch stable # uri suite component -# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable +# ynh_add_repo --uri=http://repo.yunohost.org/debian/ --suite=stretch --component=stable # # Requires YunoHost version 3.8.1 or higher. ynh_add_repo() { diff --git a/src/migrations/0027_migrate_to_bookworm.py b/src/migrations/0027_migrate_to_bookworm.py index ac8becccdc..0e8d40c736 100644 --- a/src/migrations/0027_migrate_to_bookworm.py +++ b/src/migrations/0027_migrate_to_bookworm.py @@ -99,7 +99,7 @@ def run(self): # Add new apt .deb signing key # - new_apt_key = "https://forge.yunohost.org/yunohost_bookworm.asc" + new_apt_key = "https://repo.yunohost.org/keys/yunohost_bookworm.asc" os.system(f'wget --timeout 900 --quiet "{new_apt_key}" --output-document=- | gpg --dearmor >"/usr/share/keyrings/yunohost-bookworm.gpg"') # Add Sury key even if extra_php_version.list was already there, @@ -419,7 +419,7 @@ def patch_apt_sources_list(self): "-e 's@ bullseye/updates @ bookworm-security @g' " "-e 's@ bullseye-@ bookworm-@g' " "-e '/non-free-firmware/!s@ non-free@ non-free non-free-firmware@g' " - "-e 's@deb.*http://forge.yunohost.org@deb [signed-by=/usr/share/keyrings/yunohost-bookworm.gpg] http://forge.yunohost.org@g' " + "-e 's@deb.*http://repo.yunohost.org@deb [signed-by=/usr/share/keyrings/yunohost-bookworm.gpg] http://repo.yunohost.org@g' " ) os.system(command)