commit: 47c4373d6071879eb61bb78c1436f6b5f1f52fe5 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Thu May 15 17:19:08 2014 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Thu May 15 17:19:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=47c4373d
config: clean up unused defaults, add seedurls --- etc/gkeys.conf | 7 +++++++ gkeys/config.py | 16 +++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/etc/gkeys.conf b/etc/gkeys.conf index 2497c30..d6bfd79 100644 --- a/etc/gkeys.conf +++ b/etc/gkeys.conf @@ -48,3 +48,10 @@ dev-seedfile: %(seedsdir)s/developer.seeds # logfile directory logdir: %(keysdir)s/logs + +[seedurls] +# Use the filenames as the keys. +# The will be paired to the seed file of the same name for fetching, updating + +release.seeds: https://dev.gentoo.org/~dolsen/gkey-seeds/release.seeds +developers.seeds: https://dev.gentoo.org/~dolsen/gkey-seeds/developer.seeds diff --git a/gkeys/config.py b/gkeys/config.py index 1883703..4e309b0 100644 --- a/gkeys/config.py +++ b/gkeys/config.py @@ -66,18 +66,16 @@ class GKeysConfig(GPGConfig): self.defaults['release-keydir'] = '%(keysdir)s/release' self.defaults['overlays-keydir'] = '%(keysdir)s/overlays' self.defaults['logdir'] = '%(keysdir)s/logs' - # known-keysfile is a repositories.xml like file of gpg seeds - # distributed through api.g.o for convenience - self.defaults['known-keysfile'] = '%(keysdir)s/knownkeys' - self.defaults['seedsdir'] = '%(keysdir)s/seeds' - self.defaults['release-seedfile'] = '%(configdir)s/release.seeds' - self.defaults['dev-seedfile'] = '%(configdir)s/developer.seeds' # local directory to scan for seed files installed via ebuild, layman # or manual install. - self.defaults['installable-seeddir'] = '%(configdir)s/installable.seeds' + self.defaults['seedsdir'] = '%(keysdir)s/seeds' + self.defaults['release-seedfile'] = '%(seedsdir)s/release.seeds' + self.defaults['dev-seedfile'] = '%(seedsdir)s/developer.seeds' self.defaults['keyserver'] = 'pool.sks-keyservers.net' - self.defaults['dev-seedurl'] = 'https://dev.gentoo.org/~dolsen/gkey-seeds/developer.seeds' - self.defaults['release-seedurl'] = 'https://dev.gentoo.org/~dolsen/gkey-seeds/release.seeds' + self.defaults['seedurls'] = { + 'release.seeds': https://dev.gentoo.org/~dolsen/gkey-seeds/release.seeds, + 'developers.seeds': https://dev.gentoo.org/~dolsen/gkey-seeds/developer.seeds, + } def read_config(self):
