From 38684410ee23535741c61c32a7d89ef4950bc1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= Date: Sun, 20 Dec 2015 19:50:37 +0000 Subject: settings: Fix pgp.mit.edu setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Links should not use the port 11371. Signed-off-by: Johannes Löthberg Signed-off-by: Evangelos Foutras --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.py b/settings.py index 0423541c..6ffed75b 100644 --- a/settings.py +++ b/settings.py @@ -156,7 +156,7 @@ LOGGING = { } ## Server used for linking to PGP keysearch results -PGP_SERVER = 'pgp.mit.edu:11371' +PGP_SERVER = 'pgp.mit.edu' # URL to fetch a current list of available ISOs ISO_LIST_URL = 'https://releng.archlinux.org/isos/' -- cgit v1.2.3 From e4381ff3b71062d49fbb8c267c6b1b4f9ce517fd Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Thu, 31 Dec 2015 03:25:41 +0200 Subject: Allow linking to the PGP server over HTTPS Signed-off-by: Evangelos Foutras --- main/templatetags/pgp.py | 6 ++++-- settings.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index 455e8f9c..16b63232 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -36,8 +36,10 @@ def pgp_key_link(key_id, link_text=None): pgp_server = getattr(settings, 'PGP_SERVER', None) if not pgp_server: return format_key(key_id) - url = 'http://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \ - (pgp_server, key_id) + pgp_server_secure = getattr(settings, 'PGP_SERVER_SECURE', False) + scheme = 'https' if pgp_server_secure else 'http' + url = '%s://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \ + (scheme, pgp_server, key_id) if link_text is None: link_text = '0x%s' % key_id[-8:] values = (url, format_key(key_id), link_text) diff --git a/settings.py b/settings.py index 6ffed75b..79271772 100644 --- a/settings.py +++ b/settings.py @@ -157,6 +157,7 @@ LOGGING = { ## Server used for linking to PGP keysearch results PGP_SERVER = 'pgp.mit.edu' +PGP_SERVER_SECURE = True # URL to fetch a current list of available ISOs ISO_LIST_URL = 'https://releng.archlinux.org/isos/' -- cgit v1.2.3