diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2015-03-06 11:44:19 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2015-03-06 11:44:19 -0800 |
| commit | 9051881401cded4e405521d66da38287aa65f4ee (patch) | |
| tree | 3c78bd15eecc148e461b9c99489f1dcde7998c77 /gkeys-ldap | |
| parent | gkeys/actions.py: _verify() Properly report a failed search (diff) | |
| download | gentoo-keys-9051881401cded4e405521d66da38287aa65f4ee.tar.gz gentoo-keys-9051881401cded4e405521d66da38287aa65f4ee.tar.bz2 gentoo-keys-9051881401cded4e405521d66da38287aa65f4ee.zip | |
update-seeds.sh: Fix capability to push the log file to another url
Diffstat (limited to 'gkeys-ldap')
| -rwxr-xr-x | gkeys-ldap/bin/update-seeds.sh | 1 | ||||
| -rw-r--r-- | gkeys-ldap/etc/update-seeds.conf | 2 | ||||
| -rw-r--r-- | gkeys-ldap/gkeyldap/cli.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh index 502fca9..53dbd83 100755 --- a/gkeys-ldap/bin/update-seeds.sh +++ b/gkeys-ldap/bin/update-seeds.sh @@ -77,6 +77,7 @@ 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}" +LOG_FILE=$( cat "${LOG_DIR}/gkeys-ldap-lastlog" ) 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 94e65e8..15d14b5 100644 --- a/gkeys-ldap/etc/update-seeds.conf +++ b/gkeys-ldap/etc/update-seeds.conf @@ -15,4 +15,4 @@ 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}" +export LOG_FILE="" diff --git a/gkeys-ldap/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py index f3add7c..f18b6de 100644 --- a/gkeys-ldap/gkeyldap/cli.py +++ b/gkeys-ldap/gkeyldap/cli.py @@ -11,6 +11,7 @@ from gkeys import __version__ from gkeys.base import CliBase from gkeys.config import GKeysConfig from gkeyldap.actions import (Actions, Available_Actions, Action_Map) +from gkeys.log import save_logname class Main(CliBase): @@ -52,6 +53,7 @@ class Main(CliBase): args = self.parse_args(sys.argv[1:]) ok = self.setup(args, os.path.join(self.config['configdir'],'gkeys.conf')) if ok: + save_logname() return self.run(args) return False |