From 52d9979d7c5cbdd13d3eea8eae8bdc9335102ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Mon, 24 Apr 2017 21:52:40 +0100
Subject: [PATCH] Fix settings in the provisioning script

---
 provisioning/bootstrap.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh
index 33ae8308..1e576a65 100644
--- a/provisioning/bootstrap.sh
+++ b/provisioning/bootstrap.sh
@@ -25,6 +25,7 @@ mysql -uroot -p$DBPASSWD -e "GRANT ALL PRIVILEGES ON test_$DBNAME.* TO '$DBUSER'
 
 # Configuration de redis
 echo "requirepass dummy" >> /etc/redis/redis.conf
+service redis restart
 
 # Installation et configuration d'Apache
 apt-get install -y apache2
@@ -39,7 +40,7 @@ chown -R ubuntu:www-data /var/www/static
 # Mise en place du .bash_profile pour tout configurer lors du `vagrant ssh`
 cat >> ~ubuntu/.bashrc <<EOF
 # On utilise la version de développement de GestioCOF
-export DJANGO_SETTINGS_MODULE='gestioCOF.settings_dev'
+export DJANGO_SETTINGS_MODULE='cof.settings.dev'
 
 # Identifiants MySQL
 export DBUSER="$DBUSER"
@@ -65,7 +66,8 @@ sudo -H -u ubuntu ~ubuntu/venv/bin/pip install -U pip
 sudo -H -u ubuntu ~ubuntu/venv/bin/pip install -r requirements.txt -r requirements-devel.txt
 
 # Préparation de Django
-sudo -H -u ubuntu DJANGO_SETTINGS_MODULE='gestioCOF.settings_dev' DBUSER=$DBUSER DBNAME=$DBNAME DBPASSWD=$DBPASSWD bash provisioning/prepare_django.sh
+if [ ! -f cof/settings/secret.py ]; then sudo -H -u ubuntu ln -s secret_example.py cof/settings/secret.py; fi
+sudo -H -u ubuntu DJANGO_SETTINGS_MODULE='cof.settings.dev' DBUSER=$DBUSER DBNAME=$DBNAME DBPASSWD=$DBPASSWD bash provisioning/prepare_django.sh
 
 # Installation du cron pour les mails de rappels
 sudo -H -u ubuntu crontab provisioning/cron.dev