diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-29 21:25:34 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-29 21:25:34 -0500 |
| commit | f4f158c3868c1770cb7d4f800881803e7250c27b (patch) | |
| tree | 201563b0ffc6d47129a8598648063588098f0830 | |
| parent | 43a5e11be51d2d73806d4a914327ead4ab3960cd (diff) | |
| parent | e4381ff3b71062d49fbb8c267c6b1b4f9ce517fd (diff) | |
Merge branch 'archweb' into archweb-generic
| -rw-r--r-- | main/templatetags/pgp.py | 6 | ||||
| -rw-r--r-- | settings.py | 3 |
2 files changed, 6 insertions, 3 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 b3b27323..79949000 100644 --- a/settings.py +++ b/settings.py @@ -157,7 +157,8 @@ LOGGING = { } ## Server used for linking to PGP keysearch results -PGP_SERVER = 'pgp.mit.edu:11371' +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/' |