commit: 4e2405a0ab88bf08e203e3ab1655473ebbcfac48
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 24 22:27:30 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Dec 24 22:27:30 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=4e2405a0
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.sample => gkeys.conf} | 4 ++--
gkeys/etc/gkeys.conf.sample | 4 ++--
gkeys/setup.py | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
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.sample b/gkeys/etc/gkeys.conf
similarity index 93%
copy from gkeys/etc/gkeys.conf.sample
copy to gkeys/etc/gkeys.conf
index d8da3f1..77869a1 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf
@@ -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/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__,
