diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-03 01:07:42 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-03 01:14:40 -0400 |
| commit | ec3ea631d5ef3e74244c71f6af2388fea540d5cc (patch) | |
| tree | 578d998ab912488f77252f295bdf89e638b86b56 | |
| parent | a2505b4184216adeafa5f4c29d6405a2aee20e61 (diff) | |
define keyserver in parabola-hackers.yml
| -rwxr-xr-x | bin/pacman-make-keyring | 4 | ||||
| -rw-r--r-- | parabola-hackers.yml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/pacman-make-keyring b/bin/pacman-make-keyring index 2d3e156..fa55892 100755 --- a/bin/pacman-make-keyring +++ b/bin/pacman-make-keyring @@ -23,6 +23,7 @@ KEYRING_NAME = parabola bin := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) yamldir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['yamldir']") +keyserver := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['keyring_keyserver']") cachedir := $(shell ruby -e "load '$(bin)/common.rb'; print cfg['keyring_cachedir']") outputdir = $(cachedir)/$(KEYRING_NAME)-keyring-$(V) @@ -31,9 +32,6 @@ ifeq ($(origin V),undefined) $(info Usage: pacman-make-keyring V=$$(date -u +%Y%m%d) [ keyserver=<HKP_URL> ]) $(info) $(error V= must be set in the environment, on the command line, etc) endif -ifeq ($(origin keyserver),undefined) - keyserver := hkp://pgp.cyberbits.eu:11371 -endif ifneq ($(findstring hkp://,${keyserver}),hkp://) $(error keyserver must be a valid hkp:// URL) endif diff --git a/parabola-hackers.yml b/parabola-hackers.yml index b993e6c..4fab8d2 100644 --- a/parabola-hackers.yml +++ b/parabola-hackers.yml @@ -48,3 +48,7 @@ pam_password_prohibit_message: '' # Where to keep files that can be cached between versions when making # the pacman keyring. keyring_cachedir: "/var/cache/parabola-hackers" + +# KeyServer which is known to be in a distributed network, +# on which Parabola Hackers keys are accessible. +keyring_keyserver: 'hkp://pgp.cyberbits.eu:11371' |