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

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

[Brian Dolbec]

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://git@git.gentoo.org/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"

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

[Brian Dolbec]

commit:     c4e60a2dc6995a2b0be701769204d11fe7d1db0f
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  5 02:17:41 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  5 22:21:33 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=c4e60a2d

Remove GKEYS_CONF from command line

Remove redundant echo in die/success functions

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

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 19c9d72..b8b4bfb 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -6,8 +6,8 @@ cwd=$(pwd)
 source ${cwd}/update-seeds.conf
 source ${cwd}/testpath
 
-die(){ echo "$@" 1>&2; echo ""; exit 1; }
-success(){ echo "$@"; echo ""; exit 0; }
+die(){ echo "$@" 1>&2; exit 1; }
+success(){ echo "$@"; exit 0; }
 
 clone_api(){
     local target=dirname ${API_DIR}
@@ -28,7 +28,7 @@ fi
 
 echo " *** Fetching new seeds from LDAP"
 cd ${GKEYS_DIR}
-gkeys-ldap -c ${GKEYS_CONF} update-seeds -C gentoo-devs || die "Seed file generation failed... aborting"
+gkeys-ldap update-seeds -C gentoo-devs || 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
@@ -42,7 +42,7 @@ else
 fi
 
 echo "Signing new developers.seeds file"
-gkeys -c ${GKEYS_CONF} sign -n ${GKEYS_SIGN} -F ${API_DIR}/${API_SEEDS} || die " *** Signing failed... exiting"
+gkeys sign -n ${GKEYS_SIGN} -F ${API_DIR}/${API_SEEDS} || die " *** Signing failed... exiting"
 
 echo "Committing changes to api repo..."
 cd ${API_DIR}

diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
index 94aff1a..eb05c92 100644
--- a/gkeys-ldap/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
@@ -4,7 +4,7 @@ export API_DIR="/var/lib/gkeys/api"
 export API_SEEDS="files/gentoo-keys/seeds/gentoo-devs.seeds"
 export API_URL="git+ssh://git@git.gentoo.org/proj/api.git"
 export GKEYS_COMMIT_MSG="Gentoo-keys: Update gentoo-devs.seeds"
-export GKEYS_CONF="/var/lib/gkeys/gkeys.conf"
+#export GKEYS_CONF="/var/lib/gkeys/gkeys.conf"
 export GKEYS_DIR="/var/lib/gkeys"
 export GKEYS_SEEDS="seeds/gentoo-devs.seeds"
 export GKEYS_SIG="sig"

[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="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"