Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the new repo.yunohost.org debian repository #1973

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helpers/helpers.v1.d/apt
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions src/migrations/0027_migrate_to_bookworm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)

Expand Down