config: clean up unused defaults, add seedurls

diff --git a/etc/gkeys.conf b/etc/gkeys.conf
index 2497c30bb02a6750450074fa1c8e921e9cc27e11..d6bfd79bf574d073ad9ec15938ddf9e4c012280f 100644 (file)
--- 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 1883703398bd8ef2414be91b15cb889e35ac37b5..4e309b0aff688dd39b55ed506d2b703cd3c00b8f 100644 (file)
--- 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):