From 4e2405a0ab88bf08e203e3ab1655473ebbcfac48 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Wed, 24 Dec 2014 14:27:30 -0800
Subject: gkeys: Copy sample conf to gkeys.conf

We must install gkeys to be runnable without the need to create a conf.
This is a basic working config.
I also renamed the gentoodevs category to gentoo-devs.
---
 .gitignore                  |  1 -
 gkeys/etc/gkeys.conf        | 84 +++++++++++++++++++++++++++++++++++++++++++++
 gkeys/etc/gkeys.conf.sample |  4 +--
 gkeys/setup.py              |  2 +-
 4 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 gkeys/etc/gkeys.conf

diff --git a/.gitignore b/.gitignore
index 81c1e82..7c82236 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-gkeys.conf
 *.py[co]
 /gkeys-gen/LICENSE
 /gkeys-gen/README.md
diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
new file mode 100644
index 0000000..77869a1
--- /dev/null
+++ b/gkeys/etc/gkeys.conf
@@ -0,0 +1,84 @@
+# Gentoo-keys configuration file
+#
+
+[base]
+
+# keyserver: server to use to obtain the keys from
+keyserver: pool.sks-keyservers.net
+
+
+# gkeysdir: Base directory to use as the path prefix to use
+# for the gkey directories, keyring settings
+# eg: '/' for root if absolute paths are used
+#     for sub-directories, keyrings
+# eg: /var/lib/gentoo/gkeys if using relative paths
+gkeysdir: /var/lib/gentoo/gkeys
+
+
+# keyring: The directory where the official keyring  with the specified keys
+# will be exported.
+keyring: %(gkeysdir)s/keyrings
+
+
+# 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
+# used when searching all seed files.
+seedsdir: %(gkeysdir)s/seeds
+
+
+# logfile directory
+logdir: /var/log/gkeys
+
+
+[permissions]
+
+# Permissions settings (octal)
+# chmod setting (octal)
+directories: 0o775
+
+#umask setting (octal)
+files: 0o007
+
+
+[seeds]
+
+# *-seedfile: json txt file of name, keyid, fingerprint
+# entry per line
+gentoo: %(seedsdir)s/gentoo.seeds
+gentoo-devs: %(seedsdir)s/gentoodevs.seeds
+
+
+[seedurls]
+
+# 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
+
+
+[sign]
+
+# GKEY nick used for verification of seeds and other gkey files
+#nick = foo
+
+
+# The home or key directory to use for signing files
+#keydir: foo
+
+
+# keyring to use if not the default
+# keyring: bar
+
+
+# The key fingerprint to use for signing
+# key: 0x01234567891012345
+
+
+# the gpg signature option to use for signing
+# type: detach-sign
diff --git a/gkeys/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index d8da3f1..77869a1 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
@@ -51,7 +51,7 @@ files: 0o007
 # *-seedfile: json txt file of name, keyid, fingerprint
 # entry per line
 gentoo: %(seedsdir)s/gentoo.seeds
-gentoodevs: %(seedsdir)s/gentoodevs.seeds
+gentoo-devs: %(seedsdir)s/gentoodevs.seeds
 
 
 [seedurls]
@@ -59,7 +59,7 @@ gentoodevs: %(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
-gentoodevs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds
+gentoo-devs: https://api.gentoo.org/gentoo-keys/seeds/gentoodevs.seeds
 
 
 [sign]
diff --git a/gkeys/setup.py b/gkeys/setup.py
index 4beae57..23af045 100755
--- a/gkeys/setup.py
+++ b/gkeys/setup.py
@@ -31,7 +31,7 @@ setup(
     packages=['gkeys'],
     scripts=['bin/gkeys'],
     data_files=(
-        #(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/gkeys/'), ['etc/gkeys.conf']),
+        (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/gkeys/'), ['etc/gkeys.conf']),
         (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/gkeys/'), ['etc/gkeys.conf.sample']),
         ),
     license=__license__,
-- 
cgit v1.2.3-65-gdbad