Pull tool configuration into a hackers-git.yml

1 files changed, 4 insertions, 11 deletions

diff --git a/bin/pgp-list-keyids b/bin/pgp-list-keyids
index 93bc292..1807faa 100755
--- a/bin/pgp-list-keyids
+++ b/bin/pgp-list-keyids
@@ -1,20 +1,13 @@
 #!/usr/bin/env ruby
 # Usage: pgp-list-keyids
-cfg_groups = {
-	:trusted => [ "hackers", "bots" ],
-	:secondary => [ "trustedusers" ]
-}
 
-######################################################################
-require 'yaml'
+load "#{File.dirname(__FILE__)}/common.rb"
 
-users = Dir.glob("users/*.yml").map{|f|YAML::load(open(f))}
-
-users.each do |user|
+load_all_users.each do |user|
 	if user["groups"]
-		if ! (user["groups"] & cfg_groups[:trusted]).empty?
+		if user["groups"].include?("keyring-trusted")
 			puts "trusted/#{user["username"]} #{user["pgp_keyid"]}"
-		elsif ! (user["groups"] & cfg_groups[:secondary]).empty?
+		elsif user["groups"].include?("keyring-secondary")
 			puts "secondary/#{user["username"]} #{user["pgp_keyid"]}"
 		elsif user["pgp_keyid"]
 			puts "revoked/#{user["username"]} #{user["pgp_keyid"]}"