Integrate master key into rest of site

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 24 insertions, 4 deletions

diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py
index 35ab8874..a3a764b4 100644
--- a/devel/management/commands/generate_keyring.py
+++ b/devel/management/commands/generate_keyring.py
@@ -13,6 +13,7 @@ import logging
 import subprocess
 import sys
 
+from devel.models import MasterKey
 from main.models import UserProfile
 
 logging.basicConfig(
@@ -48,11 +49,14 @@ def generate_keyring(keyserver, keyring):
             pgp_key__isnull=False).extra(where=["pgp_key != ''"]).values_list(
             "pgp_key", flat=True)
     logger.info("%d keys fetched from user profiles", len(key_ids))
+    master_key_ids = MasterKey.objects.values_list("pgp_key", flat=True)
+    logger.info("%d keys fetched from master keys", len(master_key_ids))
 
     gpg_cmd = ["gpg", "--no-default-keyring", "--keyring", keyring,
             "--keyserver", keyserver, "--recv-keys"]
     logger.info("running command: %r", gpg_cmd)
     gpg_cmd.extend(key_ids)
+    gpg_cmd.extend(master_key_ids)
     subprocess.check_call(gpg_cmd)
     logger.info("keyring at %s successfully updated", keyring)
 
diff --git a/sitemaps.py b/sitemaps.py
index 7718002d..958d1f44 100644
--- a/sitemaps.py
+++ b/sitemaps.py
@@ -71,10 +71,24 @@ class BaseSitemap(Sitemap):
     base_viewnames = (
             ('index', 1.0, 'hourly'),
             ('packages-search', 0.8, 'hourly'),
-            'page-about', 'page-art', 'page-svn', 'page-devs', 'page-tus',
-            'page-fellows', 'page-donate', 'page-download', 'news-list',
-            'feeds-list', 'groups-list', 'mirror-list', 'mirror-status',
-            'mirrorlist', 'packages-differences', 'releng-test-overview',
+            ('page-keys', 0.8, 'weekly'),
+            ('news-list', 0.7, 'weekly'),
+            ('groups-list', 0.5, 'weekly'),
+            ('mirror-status', 0.4, 'hourly'),
+            'page-about',
+            'page-art',
+            'page-svn',
+            'page-devs',
+            'page-tus',
+            'page-fellows',
+            'page-donate',
+            'page-download',
+            'feeds-list',
+            'mirror-list',
+            'mirrorlist',
+            'packages-differences',
+            'releng-test-overview',
+            'visualize-index',
     )
 
     def items(self):
diff --git a/templates/public/index.html b/templates/public/index.html
index 854bd447..4bd26f6b 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -170,6 +170,8 @@
     <h4>Development</h4>
 
     <ul>
+        <li><a href="{% url page-keys %}"
+            title="Package/Database signing master keys">Master Keys</a></li>
         <li><a href="/packages/"
             title="View/search the package repository database">Packages</a></li>
         <li><a href="/groups/"