aboutsummaryrefslogtreecommitdiff
path: root/gkeys/etc
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-12-23 13:22:52 -0800
committerBrian Dolbec <dolsen@gentoo.org>2014-12-23 13:22:52 -0800
commit141b499298ea41b4fabadad1b2f368259b8806b2 (patch)
treec951c67088bd5b779c19737dbdcee31bbb570dab /gkeys/etc
parentgkeys/actions.py: Fix listseed action for the new category/seedfile handling (diff)
downloadgentoo-keys-141b499298ea41b4fabadad1b2f368259b8806b2.tar.gz
gentoo-keys-141b499298ea41b4fabadad1b2f368259b8806b2.tar.bz2
gentoo-keys-141b499298ea41b4fabadad1b2f368259b8806b2.zip
gkeys/etc/gkeys.conf.sample: Update for new category/seedfile handling
Diffstat (limited to 'gkeys/etc')
-rw-r--r--gkeys/etc/gkeys.conf.sample33
1 files changed, 10 insertions, 23 deletions
diff --git a/gkeys/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index 4c6b2d0..d8da3f1 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
@@ -1,7 +1,7 @@
# Gentoo-keys configuration file
#
-[DEFAULT]
+[base]
# keyserver: server to use to obtain the keys from
keyserver: pool.sks-keyservers.net
@@ -15,29 +15,16 @@ keyserver: pool.sks-keyservers.net
gkeysdir: /var/lib/gentoo/gkeys
-# dev-category: The directory where the gentoo developer keys
-# will be stored.
-dev-category: %(gkeysdir)s/devs
-
-
-# rel-category: The directory where the official release media keys
-# will be stored.
-rel-category: %(gkeysdir)s/release
-
-
-# sign-category: The directory to use as the path prefix to use
-# for the signing capable keyrings, keyring settings
-sign-category: %(gkeysdir)s/sign
-
-
# keyring: The directory where the official keyring with the specified keys
# will be exported.
-keyring: %(gkeysdir)s/keyring
+keyring: %(gkeysdir)s/keyrings
-# overlayskeydir: The directory where the overlay keys
-# will be stored.
-overlays-category: %(gkeysdir)s/overlays
+# Base directory to use as the path prefix to use
+# for the signing capable keyrings, keyring settings
+# eg: '/' for root if absolute paths are used for homedir, keyring
+# eg: %(gkeysdir)s if using relative paths
+sign-keydir: %(gkeysdir)s/sign
# seedsdir: The directory for all seed files
@@ -75,11 +62,11 @@ gentoo: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds
gentoodevs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds
-# GKEY nick used for verification of seeds and other gkey files
-gkey = gkeys
+[sign]
+# GKEY nick used for verification of seeds and other gkey files
+#nick = foo
-[sign]
# The home or key directory to use for signing files
#keydir: foo