From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B79E6138ACE for ; Thu, 25 Dec 2014 18:20:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3807E09F8; Thu, 25 Dec 2014 18:20:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46B93E0A43 for ; Thu, 25 Dec 2014 18:20:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B64D340633 for ; Thu, 25 Dec 2014 18:20:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E61DD5B2 for ; Thu, 25 Dec 2014 18:20:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1419530574.55fca6da3526f018d0dfb338d861c40c3f9c3e5c.dol-sen@gentoo> Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/etc/, gkeys-ldap/bin/ X-VCS-Repository: proj/gentoo-keys X-VCS-Files: gkeys-ldap/bin/update-seeds.sh gkeys-ldap/etc/update-seeds.conf X-VCS-Directories: gkeys-ldap/bin/ gkeys-ldap/etc/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 55fca6da3526f018d0dfb338d861c40c3f9c3e5c X-VCS-Branch: master Date: Thu, 25 Dec 2014 18:20:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aad2f7ba-ca88-41ad-9d82-ca6f3b0d0f62 X-Archives-Hash: 40751a0414f8556ad664afd1e99d68bb commit: 55fca6da3526f018d0dfb338d861c40c3f9c3e5c Author: Brian Dolbec gentoo org> AuthorDate: Thu Dec 25 18:02:54 2014 +0000 Commit: Brian Dolbec gmail 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"