Re-add init script including migration and fixture import

diff --git a/.gitignore b/.gitignore
index 45b65c2e2c166bdce9a997784a0be05e873ecb97..d169a56c10e17933223181e3496697a7c1971861 100644 (file)
--- 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 8884f787ad27439b586dcd872bdad3b0c7e1ab52..4e830f330ddca7c25cdef528ef7c33ea5b740d0c 100755 (executable)
--- 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 (executable)
index 0000000..f8d1abb
--- /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 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c..681228473598a8fa8273711c65aa55636ec08fd1 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c
+Subproject commit 681228473598a8fa8273711c65aa55636ec08fd1