Author: justi9 Date: 2009-08-31 15:48:45 -0400 (Mon, 31 Aug 2009) New Revision: 3603 Removed: mgmt/trunk/cumin/bin/cumin-admin mgmt/trunk/cumin/bin/cumin-admin-test Modified: mgmt/trunk/cumin/bin/cumin-database-destroy mgmt/trunk/cumin/bin/cumin-database-init Log: Delete obsolote wrappers; convert cumin-database-* to simple wrappers around mint-database, with a deprecation warning Deleted: mgmt/trunk/cumin/bin/cumin-admin =================================================================== --- mgmt/trunk/cumin/bin/cumin-admin 2009-08-31 19:23:48 UTC (rev 3602) +++ mgmt/trunk/cumin/bin/cumin-admin 2009-08-31 19:48:45 UTC (rev 3603) @@ -1,12 +0,0 @@ -#!/usr/bin/python - -import sys, os - -from cumin.tools import CuminAdminTool - -if __name__ == "__main__": - try: - tool = CuminAdminTool("cumin-admin") - tool.main() - except KeyboardInterrupt: - pass Deleted: mgmt/trunk/cumin/bin/cumin-admin-test =================================================================== --- mgmt/trunk/cumin/bin/cumin-admin-test 2009-08-31 19:23:48 UTC (rev 3602) +++ mgmt/trunk/cumin/bin/cumin-admin-test 2009-08-31 19:48:45 UTC (rev 3603) @@ -1,35 +0,0 @@ -#!/bin/bash - -id="$RANDOM" -code=0 -tmpdir=$(mktemp -d) -trap "rm -rf ${tmpdir}" EXIT - -while read command; do - echo -n "Testing command '$command'..." - - $command &> "${tmpdir}/output" - - if [[ $? == 0 ]]; then - echo " OK" - else - echo - echo "Command failed with exit code $?" - echo "Output:" - cat "${tmpdir}/output" - code=1 - fi -done <<EOF -cumin-admin --help -cumin-admin add-user "$id" changeme -cumin-admin assign "$id" admin -cumin-admin unassign "$id" admin -cumin-admin list-users -cumin-admin remove-user "$id" --force -cumin-admin add-qmf-server "$id" "$id" -cumin-admin list-qmf-servers -cumin-admin remove-qmf-server "$id" -cumin-admin list-roles -EOF - -exit "$code" Modified: mgmt/trunk/cumin/bin/cumin-database-destroy =================================================================== --- mgmt/trunk/cumin/bin/cumin-database-destroy 2009-08-31 19:23:48 UTC (rev 3602) +++ mgmt/trunk/cumin/bin/cumin-database-destroy 2009-08-31 19:48:45 UTC (rev 3603) @@ -1,12 +1,6 @@ #!/bin/bash -e -# This script assumes that postgresql is configured and running +echo "Warning: this command is deprecated; it has been replaced by" +echo "the command 'mint-database destroy'" -if [[ "$EUID" != "0" ]]; then - echo "This script must be run as root" - exit 2 -fi - -su - postgres -c "psql -c '\q'" -su - postgres -c "dropdb cumin 2> /dev/null || :" -su - postgres -c "dropuser cumin 2> /dev/null || :" +exec mint-database destroy Modified: mgmt/trunk/cumin/bin/cumin-database-init =================================================================== --- mgmt/trunk/cumin/bin/cumin-database-init 2009-08-31 19:23:48 UTC (rev 3602) +++ mgmt/trunk/cumin/bin/cumin-database-init 2009-08-31 19:48:45 UTC (rev 3603) @@ -1,16 +1,6 @@ #!/bin/bash -e -# This script assumes that postgresql is configured and running +echo "Warning: this command is deprecated; it has been replaced by" +echo "the command 'mint-database create'" -if [[ "$EUID" != "0" ]]; then - echo "This script must be run as root" - exit 1 -fi - -su - postgres -c "psql -c '\q'" -su - postgres -c "createuser --superuser cumin 2> /dev/null || :" -su - postgres -c "createdb --owner=cumin cumin 2> /dev/null || :" - -cumin-admin check-schema | grep -e '^OK ' || { - cumin-admin create-schema -} +exec mint-database create