diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2019-11-26 21:02:49 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-11-26 21:02:49 -0500 |
commit | 719161d52c71192f59d75742898d61590e99d524 (patch) | |
tree | e246a5c25f7a7b2ee5178a99233c83d38b959bd5 | |
parent | bb3d3cb473e2ab53ee29e6f12d96a0df7a4a6b71 (diff) |
wip - import keys from hackers.gitwip-import-keys-from-hackers-git
-rw-r--r-- | bin/common.rb.in | 3 | ||||
-rwxr-xr-x | bin/pacman-make-keyring | 2 | ||||
-rw-r--r-- | parabola-hackers.yml | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/bin/common.rb.in b/bin/common.rb.in index f8c971c..03245ea 100644 --- a/bin/common.rb.in +++ b/bin/common.rb.in @@ -23,6 +23,9 @@ def cfg if ENV['PARABOLA_HACKERS_YAMLDIR'] @cfg["yamldir"] = ENV['PARABOLA_HACKERS_YAMLDIR'] end + if ENV['PARABOLA_HACKERS_KEYSDIR'] + @cfg["keysdir"] = ENV['PARABOLA_HACKERS_KEYSDIR'] + end end return @cfg end diff --git a/bin/pacman-make-keyring b/bin/pacman-make-keyring index 702ea69..101f92c 100755 --- a/bin/pacman-make-keyring +++ b/bin/pacman-make-keyring @@ -24,6 +24,7 @@ endif bin := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) yamldir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['yamldir']") +keysdir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['keysdir']") cachedir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['keyring_cachedir']") outputdir = $(cachedir)/$(KEYRING_NAME)-keyring-$(V) @@ -138,6 +139,7 @@ keyid=$(keyid.$(patsubst %.asc,%,$(notdir $@))) $(outputdir)/${KEYRING_NAME}-trusted: ${users} | $(outputdir) $(bin)/pgp-list-keyids | sed -rn 's|^trusted/\S+ (\S+)|\1:4:|p' > $@ $(cachedir)/keys/trusted/%.asc : $(cachedir)/stamp.gpg-init | $(cachedir)/keys/trusted + TODO: "if exists ${keysdir}/${keyid}.asc ..." else "the original behavior below" ${GPG} --recv-keys ${keyid} &>/dev/null printf 'minimize\nquit\ny\n' | ${GPG} --command-fd 0 --edit-key ${keyid} printf 'y\ny\n' | ${GPG} --command-fd 0 --lsign-key ${keyid} &>/dev/null diff --git a/parabola-hackers.yml b/parabola-hackers.yml index b993e6c..9e14514 100644 --- a/parabola-hackers.yml +++ b/parabola-hackers.yml @@ -2,6 +2,9 @@ # Where to look for "${uid}.yml" files yamldir: "/var/lib/hackers-git/users" +# Where to look for "${keyid}.asc" files +keysdir: "/var/lib/hackers-git/keys" + # Which groups imply membership in other groups (since UNIX groups # can't be nested). # |