| 1 |
commit: 2193550912cb4166ba0dc251f6a757ed8bd0c30e |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 6 21:00:29 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 6 21:00:29 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=21935509 |
| 7 |
|
| 8 |
update-seeds: Add keychain support |
| 9 |
|
| 10 |
gkeys-ldap/bin/update-seeds.sh | 2 ++ |
| 11 |
gkeys-ldap/etc/update-seeds.conf | 2 ++ |
| 12 |
2 files changed, 4 insertions(+) |
| 13 |
|
| 14 |
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh |
| 15 |
index 53dbd83..c8f9e78 100755 |
| 16 |
--- a/gkeys-ldap/bin/update-seeds.sh |
| 17 |
+++ b/gkeys-ldap/bin/update-seeds.sh |
| 18 |
@@ -6,6 +6,8 @@ cwd=$(pwd) |
| 19 |
source ${cwd}/update-seeds.conf |
| 20 |
source ${cwd}/testpath |
| 21 |
|
| 22 |
+eval `keychain --noask --eval ${SSH_KEY} ${GPG_KEY}` |
| 23 |
+ |
| 24 |
die(){ echo "$@" 1>&2; exit 1; } |
| 25 |
success(){ echo "$@"; exit 0; } |
| 26 |
|
| 27 |
|
| 28 |
diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf |
| 29 |
index 15d14b5..0a74312 100644 |
| 30 |
--- a/gkeys-ldap/etc/update-seeds.conf |
| 31 |
+++ b/gkeys-ldap/etc/update-seeds.conf |
| 32 |
@@ -16,3 +16,5 @@ export GKEYS_SIGN="gkeys" |
| 33 |
export LOG_UPLOAD_URL="dolsen@××××××××××.org:~dolsen/public_html/gkey-logs/" |
| 34 |
export LOG_DIR="${GKEYS_DIR}/logs" |
| 35 |
export LOG_FILE="" |
| 36 |
+export SSH_KEY="~/.ssh/id_dsa" |
| 37 |
+export GPG_KEY="0x825533CBF6CD6C97" |
Archives