wkd: Include service keys

1 files changed, 17 insertions, 14 deletions

diff --git a/_plugins/wkd.rb b/_plugins/wkd.rb
index c225f62..366a092 100644
--- a/_plugins/wkd.rb
+++ b/_plugins/wkd.rb
@@ -6,7 +6,8 @@ require 'digest'
 
 module Gentoo
   class WKDGenerator < Jekyll::Generator
-    KEYRING = '_data/active-devs.gpg'
+    DEV_KEYRING = '_data/active-devs.gpg'
+    SERVICE_KEYRING = '_data/service-keys.gpg'
     WKD_DIR = '.well-known/openpgpkey/'
 
     def generate(site)
@@ -14,20 +15,22 @@ module Gentoo
       # Base32 module supports that and the zBase32 modules are hard to get
       Base32.table = 'ybndrfg8ejkmcpqxot1uwisza345h769'
 
-      site.data['userinfo']['current'].each do |nick, details|
-        begin
-          fps = details['gpgfp'].map { |fp| fp.gsub(/\s+/, '') }
-          if not fps.empty?
-            IO.popen(['gpg', '--no-default-keyring', '--keyring', KEYRING,
-                      '--export', *fps], mode='rb') { |p|
-              keydata = p.read
-              if not keydata.empty?
-                site.pages << WKDFile.new(site, nick, keydata)
-              end
-            }
+      [['current', DEV_KEYRING], ['system', SERVICE_KEYRING]].each do |group, keyring|
+        site.data['userinfo'][group].each do |nick, details|
+          begin
+            fps = details['gpgfp'].map { |fp| fp.gsub(/\s+/, '') }
+            if not fps.empty?
+              IO.popen(['gpg', '--no-default-keyring', '--keyring', keyring,
+                        '--export', *fps], mode='rb') { |p|
+                keydata = p.read
+                if not keydata.empty?
+                  site.pages << WKDFile.new(site, nick, keydata)
+                end
+              }
+            end
+          rescue
+            # fail them silently
           end
-        rescue
-          # fail them silently
         end
       end