[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[Brian Dolbec]

commit:     141b499298ea41b4fabadad1b2f368259b8806b2
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 21:22:52 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 23 21:22:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=141b4992

gkeys/etc/gkeys.conf.sample: Update for new category/seedfile handling

---
 gkeys/etc/gkeys.conf.sample | 33 ++++++++++-----------------------
 1 file 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

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[Brian Dolbec]

commit:     e99ad7f414f447dbd4acdde0267366fc14852758
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 25 18:19:12 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Dec 25 18:19:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=e99ad7f4

gkeys: Update configs with name/permissions changes

---
 gkeys/etc/gkeys.conf        | 6 +++---
 gkeys/etc/gkeys.conf.sample | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index 77869a1..3c79243 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -43,7 +43,7 @@ logdir: /var/log/gkeys
 directories: 0o775
 
 #umask setting (octal)
-files: 0o007
+files: 0o002
 
 
 [seeds]
@@ -51,7 +51,7 @@ files: 0o007
 # *-seedfile: json txt file of name, keyid, fingerprint
 # entry per line
 gentoo: %(seedsdir)s/gentoo.seeds
-gentoo-devs: %(seedsdir)s/gentoodevs.seeds
+gentoo-devs: %(seedsdir)s/gentoo-devs.seeds
 
 
 [seedurls]
@@ -59,7 +59,7 @@ gentoo-devs: %(seedsdir)s/gentoodevs.seeds
 # Use the filenames as the keys.
 # The will be paired to the seed file of the same name for fetching, updating
 gentoo: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds
-gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds
+gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoo-devs.seeds
 
 
 [sign]

diff --git a/gkeys/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index 77869a1..3c79243 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
@@ -43,7 +43,7 @@ logdir: /var/log/gkeys
 directories: 0o775
 
 #umask setting (octal)
-files: 0o007
+files: 0o002
 
 
 [seeds]
@@ -51,7 +51,7 @@ files: 0o007
 # *-seedfile: json txt file of name, keyid, fingerprint
 # entry per line
 gentoo: %(seedsdir)s/gentoo.seeds
-gentoo-devs: %(seedsdir)s/gentoodevs.seeds
+gentoo-devs: %(seedsdir)s/gentoo-devs.seeds
 
 
 [seedurls]
@@ -59,7 +59,7 @@ gentoo-devs: %(seedsdir)s/gentoodevs.seeds
 # Use the filenames as the keys.
 # The will be paired to the seed file of the same name for fetching, updating
 gentoo: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds
-gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds
+gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoo-devs.seeds
 
 
 [sign]

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[Brian Dolbec]

commit:     920909aaa68421f2999c4bb5c917a9b6274504fa
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  1 21:15:21 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  1 21:15:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=920909aa

gkeys: update gkeys.conf

---
 gkeys/etc/gkeys.conf | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index d9a42c0..e30d804 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -15,30 +15,38 @@ keyserver: pool.sks-keyservers.net
 gkeysdir: /var/lib/gentoo/gkeys
 
 
-# keyring: The directory where the official keyring  with the specified keys
-# will be exported.
+# default user home directory
+homedir: ~
+
+
+# user gkey directory
+user-dir = %(homedir)s/gkeys-user
+
+
+# base keyring dir
 keyring: %(gkeysdir)s/keyrings
 
 
-# The default keyring to use
+# The default keyring, nick to use
 # for verification if not specified
 verify-keyring: gentoo
+verify-nick: gkeys
 
 
 # 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
+sign-keydir: %(keyring)s/sign
 
 
-# seedsdir: The directory for all seed files
+# seedsdir: base directory for all seed files
 # used when searching all seed files.
 seedsdir: %(gkeysdir)s/seeds
 
 
 # logfile directory
-logdir: /var/log/gkeys
+logdir: %(gkeysdir)s/logs
 
 
 [permissions]
@@ -48,7 +56,7 @@ logdir: /var/log/gkeys
 directories: 0o775
 
 #umask setting (octal)
-files: 0o002
+files: 0o022
 
 
 [seeds]
@@ -62,14 +70,24 @@ files: 0o002
 gentoo: %(seedsdir)s/gentoo.seeds
 gentoo-devs: %(seedsdir)s/gentoo-devs.seeds
 
+# Add sign here for ability to choose as a category
+# but leave the value blank to prevent accidental changes
+# this subdir directory is where you would copy your gpghome directories to
+# after creating your key with gkey-gen. Name them the same as the nick you use.
+#sign:
+
 
 [seedurls]
 
 # Use the filenames as the keys.
 # The will be paired to the seed file of the same name for fetching, updating
+# category = category or seedfile name
+# eg: category: url
 gentoo: https://api.gentoo.org/gentoo-keys/seeds/gentoo.seeds
 gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoo-devs.seeds
 
+#sign:
+
 
 [verify-seeds]
 
@@ -79,24 +97,22 @@ gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoo-devs.seeds
 gentoo: gentoo gkeys
 gentoo-devs: gentoo gkeys
 
+#sign:
+
 
 [sign]
 
 # GKEY nick used for verification of seeds and other gkey files
-#nick = foo
-
+nick =
 
 # The home or key directory to use for signing files
-#keydir: foo
-
+keydir:
 
 # keyring to use if not the default
-# keyring: bar
-
+#keyring:
 
 # The key fingerprint to use for signing
-# key: 0x01234567891012345
-
+key:
 
 # the gpg signature option to use for signing
-# type: detach-sign
+type: detach-sign

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[Brian Dolbec]

commit:     2354bad68ab6d18fbbdcd28914587d4fd62092d5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  1 22:00:26 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  1 22:00:26 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=2354bad6

etc/gkeys.conf: Set a normal default log directory

---
 gkeys/etc/gkeys.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index e30d804..19f843a 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -46,7 +46,8 @@ seedsdir: %(gkeysdir)s/seeds
 
 
 # logfile directory
-logdir: %(gkeysdir)s/logs
+#logdir: %(gkeysdir)s/logs
+logdir: /var/log/gkeys
 
 
 [permissions]

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

[Brian Dolbec]

commit:     0d1aee43cfde530a4abcdbdfffe6b0c17bbe05ee
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  5 19:28:03 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 05:22:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=0d1aee43

gkets etc/*: Update for individual keyring locations.

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 gkeys/etc/gkeys.conf        | 7 +++++++
 gkeys/etc/gkeys.conf.sample | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index 392df74..c3b1b91 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -66,6 +66,13 @@ directories: 0o775
 files: 0o022
 
 
+[keyrings]
+# configured locations of keyrings
+gentoo: %(gkeysdir)s/keyrings/gentoo
+gentoo-devs: %(gkeysdir)s/keyrings/gentoo-devs
+user: %(homedir)s/.gnupg
+
+
 [seeds]
 
 # file is a json text file of: nick, name, keydir, fingerprint

diff --git a/gkeys/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index d9a42c0..ace3ddd 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
@@ -51,6 +51,13 @@ directories: 0o775
 files: 0o002
 
 
+[keyrings]
+# configured locations of keyrings
+gentoo: %(gkeysdir)s/keyrings/gentoo
+gentoo-devs: %(gkeysdir)s/keyrings/gentoo-devs
+user: %(homedir)s/.gnupg
+
+
 [seeds]
 
 # file is a json text file of: nick, name, keydir, fingerprint