diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-01-15 09:36:43 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-01-30 20:39:42 -0800 |
| commit | 3cbba703e8309d7dea5728ab8f9ad4d6b6b8eaf3 (patch) | |
| tree | ed32340b72165586b65fde9ba9129fdce1fd4d25 /gkeys-ldap | |
| parent | gkeys-ldap: Add version info in cli.py, update version (diff) | |
| download | gentoo-keys-3cbba703e8309d7dea5728ab8f9ad4d6b6b8eaf3.tar.gz gentoo-keys-3cbba703e8309d7dea5728ab8f9ad4d6b6b8eaf3.tar.bz2 gentoo-keys-3cbba703e8309d7dea5728ab8f9ad4d6b6b8eaf3.zip | |
gkeys-ldap: Add saving the logfilename to know which log file to push
Add uploading the log file to my dev space for public access.
cgh
Diffstat (limited to 'gkeys-ldap')
| -rwxr-xr-x | gkeys-ldap/bin/update-seeds.sh | 3 | ||||
| -rw-r--r-- | gkeys-ldap/etc/update-seeds.conf | 3 | ||||
| -rw-r--r-- | gkeys-ldap/gkeyldap/cli.py | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh index f096cb8..502fca9 100755 --- a/gkeys-ldap/bin/update-seeds.sh +++ b/gkeys-ldap/bin/update-seeds.sh @@ -76,5 +76,8 @@ git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add ${GKEYS_SEEDS}.sig git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates" git push origin master || die " *** git push failed" +echo "Pushing the log file to ${LOG_UPLOAD_URL}" +scp "${LOG_DIR}/${LOG_FILE}" "${LOG_UPLOAD_URL}" || die "Failed to upload logfile: ${LOG_FILE}" + success "Successfully updated developer.seeds" diff --git a/gkeys-ldap/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf index 5b87b48..94e65e8 100644 --- a/gkeys-ldap/etc/update-seeds.conf +++ b/gkeys-ldap/etc/update-seeds.conf @@ -13,3 +13,6 @@ export GKEYS_COMMIT_MSG="Gentoo-keys: Update gentoo-devs.seeds" export GKEYS_SEEDS="seeds/gentoo-devs.seeds" export GKEYS_SIG="sig" 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="${GKEYS_LOG}" diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py index b134ed9..f3add7c 100644 --- a/gkeys-ldap/gkeyldap/cli.py +++ b/gkeys-ldap/gkeyldap/cli.py @@ -33,7 +33,7 @@ class Main(CliBase): 'Actions': Actions, 'Available_Actions': Available_Actions, 'Action_Map': Action_Map, - 'prog': 'gkey-ldap', + 'prog': 'gkeys-ldap', 'description': 'Gentoo-keys LDAP interface and seed file generator program', 'epilog': '''CAUTION: adding UNTRUSTED keys can be HAZARDOUS to your system!''' } |