diff options
| author | jc0b <j@jc0b.computer> | 2020-06-30 16:30:27 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:43:50 +0200 |
| commit | 8133905047285b01c9ebaab43bfe4f6c86cf2623 (patch) | |
| tree | 671edebd731e1ce87382b2a0542ef3d3e89aa8a4 /build | |
| parent | 66b2d85385d05abb590535da60341876ecdbab71 (diff) | |
| parent | 8ede2b8597eb14c0567c2c3c0135593f7c557521 (diff) | |
Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration
Diffstat (limited to 'build')
| -rwxr-xr-x | build/configure.sh | 20 | ||||
| -rw-r--r-- | build/supervisord.conf | 9 |
2 files changed, 0 insertions, 29 deletions
diff --git a/build/configure.sh b/build/configure.sh index ceb1e616..7dda7773 100755 --- a/build/configure.sh +++ b/build/configure.sh @@ -13,8 +13,6 @@ if [ -z "$MONGO_DB_PASSWORD" ]; then exit 1 fi -#MYSQL_COMMAND="mysql -h mariadb -u $MYSQL_USER --password=$MYSQL_PASSWORD" - MONGO_COMMAND="mongo $MONGO_DB -h $MONGO_DB_HOST --port $MONGO_DB_PORT -u $MONGO_DB_USERNAME -p $MONGO_DB_PASSWORD --authenticationDatabase $MONGO_DB" until eval $MONGO_COMMAND --eval 'db.getCollectionNames();' ; do @@ -23,21 +21,3 @@ until eval $MONGO_COMMAND --eval 'db.getCollectionNames();' ; do done echo "MongoDB available" - -#NUM_TABLES=$(eval "$MYSQL_COMMAND -B --disable-column-names -e \"SELECT count(*) FROM information_schema.tables WHERE table_schema='$MYSQL_DATABASE';\"") - -# Check if database is empty -#if [ "$NUM_TABLES" -eq 0 ]; then -# eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/schema.sql -# eval $MYSQL_COMMAND "$MYSQL_DATABASE" < ./database/test.sql -#fi - -# Writing databse config values to keys.json -cat keys.json | python -c "import os, sys, json; ks = json.load(sys.stdin); \ - ks['MONGODB_HOST'] = os.environ['MONGO_DB_HOST']; \ - ks['MONGODB_PORT'] = os.environ['MONGO_DB_PORT']; \ - ks['MONGODB_DATABASE'] = os.environ['MONGO_DB']; \ - ks['MYSQL_USER'] = os.environ['MONGO_DB_USER']; \ - ks['MYSQL_PASSWORD'] = os.environ['MONGO_DB_PASSWORD']; \ - print json.dumps(ks, indent=4)" > new_keys.json -mv new_keys.json keys.json diff --git a/build/supervisord.conf b/build/supervisord.conf deleted file mode 100644 index 37b5cc16..00000000 --- a/build/supervisord.conf +++ /dev/null @@ -1,9 +0,0 @@ -[supervisord] -nodaemon=true - -[program:web-server] -command=/usr/bin/python2.7 /opendc/opendc-web-server/main.py /opendc/keys.json -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 |