tripe-keys: Provide upload-hook for more complicated publishing.

[tripe] / keys / tripe-keys.in

diff --git a/keys/tripe-keys.in b/keys/tripe-keys.in
index 9ca903c..1167dea 100644 (file)
--- a/keys/tripe-keys.in
+++ b/keys/tripe-keys.in
@@ -129,6 +129,7 @@ def conf_defaults():
                ('sig-file', '${base-dir}${sig-base}'),
                ('repos-file', '${base-dir}${repos-base}'),
                ('conf-file', '${base-dir}tripe-keys.conf'),
+               ('upload-hook', ': run upload hook'),
                ('kx', 'dh'),
                ('kx-param', lambda: {'dh': '-LS -b2048 -B256',
                                      'ec': '-Cnist-p256'}[conf['kx']]),
@@ -197,7 +198,7 @@ Subcommands available:
 def master_keys():
   if not OS.path.exists('master'):
     return
-  for k in C.KeyFile('master'):
+  for k in C.KeyFile('master').itervalues():
     if (k.type != 'tripe-keys-master' or
         k.expiredp or
         not k.tag.startswith('master-')):
@@ -280,6 +281,7 @@ def cmd_upload(args):
   finally:
     OS.chdir(cwd)
     rmtree('tmp')
+  run('sh -c ${upload-hook}')
 
 def cmd_update(args):
   cwd = OS.getcwd()