From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 5 Jan 2017 17:10:01 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=91ba9ba43cabf03171f389bebf48abe35525266a;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www

Conflicts:
	.gitignore
	app/bin/app.sh
---

91ba9ba43cabf03171f389bebf48abe35525266a
diff --cc .gitignore
index 93312a9c,d169a56c..57464426
--- a/.gitignore
+++ b/.gitignore
@@@ -15,7 -15,7 +15,8 @@@ develop-egg
  .thumbnails
  .tmp
  *.lock
 +var
+ .init
  
  # Installer logs
  pip-log.txt
diff --cc app/bin/init.sh
index 00000000,f8d1abb8..3b092d60
mode 000000,100755..100755
--- a/app/bin/init.sh
+++ b/app/bin/init.sh
@@@ -1,0 -1,12 +1,13 @@@
+ #!/bin/bash
+ 
+ # paths
+ app='/srv/app'
+ manage=$app'/manage.py'
+ 
+ python $manage migrate --noinput
+ python $manage create-admin-user
++python $manage create-default-organization
+ 
+ # @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