diff --git a/cof/settings/common.py b/cof/settings/common.py
index bdbf179f..ba0b6044 100644
--- a/cof/settings/common.py
+++ b/cof/settings/common.py
@@ -136,7 +136,7 @@ TEMPLATES = [
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.mysql',
+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': DBNAME,
'USER': DBUSER,
'PASSWORD': DBPASSWD,
diff --git a/cof/settings/dev.py b/cof/settings/dev.py
index 61201ea5..01651bba 100644
--- a/cof/settings/dev.py
+++ b/cof/settings/dev.py
@@ -19,9 +19,9 @@ DEBUG = True
# ---
STATIC_URL = '/static/'
-STATIC_ROOT = '/var/www/static/'
+STATIC_ROOT = '/srv/gestiocof/static/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+MEDIA_ROOT = '/srv/gestiocof/media/'
MEDIA_URL = '/media/'
diff --git a/provisioning/apache.conf b/provisioning/apache.conf
deleted file mode 100644
index db5bd602..00000000
--- a/provisioning/apache.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-
- ServerName default
- DocumentRoot /var/www/html
-
- ProxyPreserveHost On
- ProxyRequests Off
- ProxyPass /static/ !
- ProxyPass /media/ !
- # Pour utiliser un sous-dossier (typiquement /gestion/), il faut faire a la
- # place des lignes suivantes:
- #
- # RequestHeader set Daphne-Root-Path /gestion
- # ProxyPass /gestion/ws/ ws://127.0.0.1:8001/ws/
- # ProxyPass /gestion http://127.0.0.1:8001/gestion
- # ProxyPassReverse /gestion http://127.0.0.1:8001/gestion
- #
- # Penser egalement a changer les /static/ et /media/ dans la config apache
- # ainsi que dans les settings django.
- ProxyPass /ws/ ws://127.0.0.1:8001/ws/
- ProxyPass / http://127.0.0.1:8001/
- ProxyPassReverse / http://127.0.0.1:8001/
-
- Alias /media /vagrant/media
- Alias /static /var/www/static
-
- Order deny,allow
- Allow from all
-
-
- Order deny,allow
- Allow from all
-
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh
index 9d210fe8..dd4f1634 100644
--- a/provisioning/bootstrap.sh
+++ b/provisioning/bootstrap.sh
@@ -9,44 +9,48 @@ DBPASSWD="4KZt3nGPLVeWSvtBZPSM3fSzXpzEU4"
# Installation de paquets utiles
apt-get update && apt-get upgrade -y
-apt-get install -y python3-pip python3-dev python3-venv libmysqlclient-dev \
- libjpeg-dev git redis-server
+apt-get install -y python3-pip python3-dev python3-venv libpq-dev postgresql \
+ postgresql-contrib libjpeg-dev nginx git redis-server
-# Configuration et installation de mysql. Le mot de passe root est le même que
-# le mot de passe pour l'utilisateur local - pour rappel, ceci est une instance
-# locale de développement.
-echo "mysql-server mysql-server/root_password password $DBPASSWD" | debconf-set-selections
-echo "mysql-server mysql-server/root_password_again password $DBPASSWD" | debconf-set-selections
+# Postgresql
+sudo -u postgres createdb $DBNAME
+sudo -u postgres createuser -SdR $DBUSER
+sudo -u postgres psql -c "ALTER USER $DBUSER WITH PASSWORD '$DBPASSWD';"
+sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DBNAME TO $DBUSER;"
-apt-get install -y mysql-server
-mysql -uroot -p$DBPASSWD -e "CREATE DATABASE $DBNAME; GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBUSER'@'localhost' IDENTIFIED BY '$DBPASSWD'"
-mysql -uroot -p$DBPASSWD -e "GRANT ALL PRIVILEGES ON test_$DBNAME.* TO '$DBUSER'@'localhost'"
-mysql -uroot -p$DBPASSWD -e "ALTER DATABASE databasename CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
-
-# Configuration de redis
+# Redis
REDIS_PASSWD="dummy"
redis-cli CONFIG SET requirepass $REDIS_PASSWD
redis-cli -a $REDIS_PASSWD CONFIG REWRITE
-# Installation et configuration d'Apache
-apt-get install -y apache2
-a2enmod proxy proxy_http proxy_wstunnel headers
-cp /vagrant/provisioning/apache.conf /etc/apache2/sites-available/gestiocof.conf
-a2ensite gestiocof
-a2dissite 000-default
-service apache2 restart
-mkdir /var/www/static
-chown -R ubuntu:www-data /var/www/static
+# Contenu static
+mkdir -p /srv/gestiocof/{media,static}
+chown -R ubuntu:www-data /srv/gestiocof
+
+# Nginx
+ln -s -f /vagrant/provisioning/nginx.conf /etc/nginx/sites-enabled/gestiocof.conf
+rm -f /etc/nginx/sites-enabled/default
+systemctl reload nginx
+
+# Environnement virtuel python
+sudo -H -u ubuntu python3 -m venv ~ubuntu/venv
+sudo -H -u ubuntu ~ubuntu/venv/bin/pip install -U pip
+sudo -H -u ubuntu ~ubuntu/venv/bin/pip install -r /vagrant/requirements-devel.txt
+
+# Daphne + runworker
+cp /vagrant/provisioning/daphne.service /etc/systemd/system/daphne.service
+cp /vagrant/provisioning/worker.service /etc/systemd/system/worker.service
+systemctl enable daphne.service
+systemctl enable worker.service
+systemctl start daphne.service
+systemctl start worker.service
# Mise en place du .bash_profile pour tout configurer lors du `vagrant ssh`
cat >> ~ubuntu/.bashrc <