From f5dddee1457b4d5eddec9438eb567908a8b0ba8b Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 4 Jan 2017 16:50:39 +0100 Subject: [PATCH] Re-add init script including migration and fixture import --- .gitignore | 1 + app/bin/app.sh | 11 +++++------ app/bin/init.sh | 12 ++++++++++++ lib/mezzanine-agenda | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 app/bin/init.sh diff --git a/.gitignore b/.gitignore index 45b65c2e..d169a56c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ develop-eggs .thumbnails .tmp *.lock +.init # Installer logs pip-log.txt diff --git a/app/bin/app.sh b/app/bin/app.sh index 8884f787..4e830f33 100755 --- a/app/bin/app.sh +++ b/app/bin/app.sh @@ -34,13 +34,12 @@ sh $app/bin/wait.sh # django setup python $manage wait-for-db -# python $manage migrate --noinput -# python $manage bower_install -- --allow-root -python $manage create-admin-user -# @todo searching every fixtures file in each folder -python $manage loaddata $app/organization/job/fixtures/organization-job.json -python $manage loaddata $app/organization/projects/fixtures/organization-projects-repositorysystems.json +# initial setup +if [ ! -f .init ]; then + bash init.sh + touch .init +fi # app start if [ "$1" = "--runserver" ]; then diff --git a/app/bin/init.sh b/app/bin/init.sh new file mode 100755 index 00000000..f8d1abb8 --- /dev/null +++ b/app/bin/init.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# paths +app='/srv/app' +manage=$app'/manage.py' + +python $manage migrate --noinput +python $manage create-admin-user + +# @todo searching every fixtures file in each folder +python $manage loaddata $app/organization/job/fixtures/organization-job.json +python $manage loaddata $app/organization/projects/fixtures/organization-projects-repositorysystems.json diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 2b2de20c..68122847 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c +Subproject commit 681228473598a8fa8273711c65aa55636ec08fd1 -- 2.39.5