Merge branch 'master' of https://gitlab.pasteur.fr/odoppelt/iPPIDB

Former-commit-id: ffe4db38a99e5cdd41c09f24307d6b49113fd1c0

.gitlab-ci.yml

@@ -8,21 +8,7 @@ test-centos7:
   - yum install -y epel-release
   - yum install install -y python34-pip python34-devel
   - yum install -y gcc graphviz graphviz-devel
+  - yum install -y httpd httpd-devel
   - cd ippisite
   - pip3 install -r requirements.txt
-  - python3 manage.py test
-test-centos7:
-  image: centos:centos7
-  stage: deploy
-  script:
-  - yum install -y epel-release
-  - yum install install -y python34-pip python34-devel
-  - yum install -y gcc graphviz graphviz-devel
-  - cd ippisite
-  - pip3 install -r requirements.txt
-  - python3 manage.py test
-  environment:
-    name: production
-    url: https://ippidb.pasteur.fr
-  only:
-  - master
\ No newline at end of file
+  - python3 manage.py test
\ No newline at end of file

ippisite/ippisite/settings.py

@@ -44,6 +44,7 @@ INSTALLED_APPS = [
     'ippidb',
     'formtools',
     'debug_toolbar',
+    'mod_wsgi.server'
 ]
 
 MIDDLEWARE = [

ippisite/manage.py

-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 import sys
 

ippisite/requirements.txt

@@ -6,4 +6,5 @@ pygraphviz
 pydot
 pyparsing
 django-formtools
-django-debug-toolbar
\ No newline at end of file
+django-debug-toolbar
+mod_wsgi
\ No newline at end of file