commit: 55fca6da3526f018d0dfb338d861c40c3f9c3e5c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 25 18:02:54 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Dec 25 18:02:54 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=55fca6da
gkeys-ldap: Update update-seeds.{sh,conf} for name changes
---
gkeys-ldap/bin/update-seeds.sh | 6 +++---
gkeys-ldap/etc/update-seeds.conf | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 94852a1..2d67c0e 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -28,7 +28,7 @@ fi
echo " *** Fetching new seeds from LDAP"
cd ${GKEYS_DIR}
-gkey-ldap -c ${GKEYS_CONF} updateseeds || die "Seed file generation failed...
aborting"
+gkeys-ldap -c ${GKEYS_CONF} updateseeds || die "Seed file generation failed...
aborting"
echo " *** Checking if seed files are up-to-date"
if ! diff -q ${GKEYS_DIR}/${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS} > /dev/null
;then
@@ -46,8 +46,8 @@ gkeys -c ${GKEYS_CONF} sign -n ${GKEYS_SIGN} -F
${API_DIR}/${API_SEEDS} || die "
echo "Committing changes to api repo..."
cd ${API_DIR}
-git add ${API_SEEDS} || die " *** Failed to add modified developers.seeds
file"
-git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add
developer.seeds.sig file"
+git add ${API_SEEDS} || die " *** Failed to add modified ${GKEYS_SEEDS} file"
+git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add
${GKEYS_SEEDS}.sig file"
git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
git push origin master || die " *** git push failed"
diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
index 71fda58..94aff1a 100644
--- a/gkeys-ldap/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
@@ -1,11 +1,11 @@
#!/bin/sh
export API_DIR="/var/lib/gkeys/api"
-export API_SEEDS="files/gentoo-keys/seeds/developer.seeds"
+export API_SEEDS="files/gentoo-keys/seeds/gentoo-devs.seeds"
export API_URL="git+ssh://[email protected]/proj/api.git"
-export GKEYS_COMMIT_MSG="Gentoo-keys: Update developer.seeds"
+export GKEYS_COMMIT_MSG="Gentoo-keys: Update gentoo-devs.seeds"
export GKEYS_CONF="/var/lib/gkeys/gkeys.conf"
export GKEYS_DIR="/var/lib/gkeys"
-export GKEYS_SEEDS="seeds/developer.seeds"
+export GKEYS_SEEDS="seeds/gentoo-devs.seeds"
export GKEYS_SIG="sig"
export GKEYS_SIGN="gkeys"