Merge branch 'master' into Kerl/cron

This commit is contained in:
Martin Pépin 2016-07-30 12:14:26 +02:00
commit c99b71d493
75 changed files with 12222 additions and 634 deletions

View file

@ -45,7 +45,7 @@ cd /vagrant
sudo -H -u vagrant pip install --user -r requirements.txt -r requirements-devel.txt
# Préparation de Django
sudo -H -u vagrant DJANGO_SETTINGS_MODULE='cof.settings_dev' DBUSER=$DBUSER DBNAME=$DBNAME DBPASSWD=$DBPASSWD python manage.py migrate
sudo -H -u vagrant DJANGO_SETTINGS_MODULE='cof.settings_dev' DBUSER=$DBUSER DBNAME=$DBNAME DBPASSWD=$DBPASSWD sh provisioning/prepare_django.sh
# Installation du cron pour les mails de rappels
sudo -H -u vagrant crontab provisioning/cron.dev

View file

@ -0,0 +1,4 @@
# Doit être lancé par bootstrap.sh
python manage.py migrate
python manage.py loaddata users root bda gestion