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

[Brian Dolbec]

commit:     2193550912cb4166ba0dc251f6a757ed8bd0c30e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 21:00:29 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 21:00:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=21935509

update-seeds: Add keychain support

 gkeys-ldap/bin/update-seeds.sh   | 2 ++
 gkeys-ldap/etc/update-seeds.conf | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 53dbd83..c8f9e78 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -6,6 +6,8 @@ cwd=$(pwd)
 source ${cwd}/update-seeds.conf
 source ${cwd}/testpath
 
+eval `keychain --noask --eval ${SSH_KEY} ${GPG_KEY}`
+
 die(){ echo "$@" 1>&2; exit 1; }
 success(){ echo "$@"; exit 0; }
 

diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
index 15d14b5..0a74312 100644
--- a/gkeys-ldap/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
@@ -16,3 +16,5 @@ export GKEYS_SIGN="gkeys"
 export LOG_UPLOAD_URL="dol...@dev.gentoo.org:~dolsen/public_html/gkey-logs/"
 export LOG_DIR="${GKEYS_DIR}/logs"
 export LOG_FILE=""
+export SSH_KEY="~/.ssh/id_dsa"
+export GPG_KEY="0x825533CBF6CD6C97"