aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-03-06 13:00:29 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-03-06 13:00:29 -0800
commit2193550912cb4166ba0dc251f6a757ed8bd0c30e (patch)
tree33bd3957b3155fd1162e88b8ec2d7cd3689bf828 /gkeys-ldap
parentupdate-seeds.sh: Fix capability to push the log file to another url (diff)
downloadgentoo-keys-2193550912cb4166ba0dc251f6a757ed8bd0c30e.tar.gz
gentoo-keys-2193550912cb4166ba0dc251f6a757ed8bd0c30e.tar.bz2
gentoo-keys-2193550912cb4166ba0dc251f6a757ed8bd0c30e.zip
update-seeds: Add keychain support
Diffstat (limited to 'gkeys-ldap')
-rwxr-xr-xgkeys-ldap/bin/update-seeds.sh2
-rw-r--r--gkeys-ldap/etc/update-seeds.conf2
2 files changed, 4 insertions, 0 deletions
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="dolsen@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"