Update instructions on download/debian page

The WeeChat PGP key is downloaded in /etc/apt/keyrings (as ASCII) and gnupg is
no longer used.

Author: flashcode

weechat/debian/models.py

@@ -27,6 +27,9 @@
 from weechat.common.i18n import i18n_autogen
 from weechat.common.path import repo_path_join
 
+WEECHAT_PGP_KEY_PATH = '/etc/apt/keyrings'
+WEECHAT_PGP_KEY_NAME = 'weechat.asc'
+
 
 class Version(models.Model):
     """Version of a Debian repository (codename + version).
@@ -75,25 +78,19 @@ def path_packages_gz(self, arch):
                               self.version.codename, 'main',
                               f'binary-{arch}', 'Packages.gz')
 
-    def apt_url(self):
-        """
-        Return the URL to use with apt for binary packages, for example:
-        "deb [signed-by=/usr/share/keyrings/weechat-archive-keyring.pgp]
-        https://weechat.org/debian sid main".
-        """
-        return (f'deb [signed-by=/usr/share/keyrings/weechat-archive-'
-                f'keyring.pgp] {self.url} {self.version.codename} main')
+    def apt_url(self, deb='deb'):
+        """Return the URL to use with apt for binary or sources packages."""
+        return (f'{deb} [arch={self.arch} '
+                f'signed-by={WEECHAT_PGP_KEY_PATH}/{WEECHAT_PGP_KEY_NAME}] '
+                f'{self.url} {self.version.codename} main')
+
+    def apt_url_binary(self):
+        """Return the URL to use with apt for binary packages."""
+        return self.apt_url(deb='deb')
 
     def apt_url_src(self):
-        """
-        Return the URL to use with apt for sources packages, for example:
-        "deb-src [signed-by=/usr/share/keyrings/weechat-archive-
-        keyring.pgp] https://weechat.org/debian sid main".
-        """
-        return (
-            f'deb-src [signed-by=/usr/share/keyrings/weechat-'
-            f'archive-keyring.pgp] {self.url} {self.version.codename} main'
-        )
+        """Return the URL to use with apt for sources packages."""
+        return self.apt_url(deb='deb-src')
 
     class Meta:
         """Sort Repos by priority."""

weechat/debian/views.py

@@ -30,9 +30,14 @@
 
 from django.conf import settings
 from django.shortcuts import render
+from django.urls import reverse
 
 from weechat.common.path import repo_path_join
-from weechat.debian.models import Repo
+from weechat.debian.models import (
+    Repo,
+    WEECHAT_PGP_KEY_PATH,
+    WEECHAT_PGP_KEY_NAME,
+)
 
 
 def get_repository_packages(repository):
@@ -110,6 +115,12 @@ def repos(request, active='active', files=''):
                                   reverse=True))
         except:  # noqa: E722  pylint: disable=bare-except
             errors.append(f'{repository.name} {repository.version}')
+    url_info_pgp_key = request.build_absolute_uri(
+        reverse(
+            'dev_info_name',
+            kwargs={'name': 'debian_repository_signing_key_asc'},
+        )
+    )
     return render(
         request,
         'download/debian.html',
@@ -119,5 +130,8 @@ def repos(request, active='active', files=''):
             'allfiles': files == 'files',
             'repositories': repositories,
             'errors': errors,
+            'weechat_pgp_key_path': WEECHAT_PGP_KEY_PATH,
+            'weechat_pgp_key_name': WEECHAT_PGP_KEY_NAME,
+            'url_info_pgp_key': url_info_pgp_key,
         },
     )