diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca3ff8e3a4a4b383b01a64297c4d330916b416fa..fe5cf4f18646668b1b0c7f0656b44140f61a221b 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/ippisite/ippisite/settings.py b/ippisite/ippisite/settings.py index f022fe76f74d05eda1d39f5830d67c5c7db6ae82..61d34fbd863ea626a1050f59425abea0cd5e27df 100644 --- a/ippisite/ippisite/settings.py +++ b/ippisite/ippisite/settings.py @@ -44,6 +44,7 @@ INSTALLED_APPS = [ 'ippidb', 'formtools', 'debug_toolbar', + 'mod_wsgi.server' ] MIDDLEWARE = [ diff --git a/ippisite/manage.py b/ippisite/manage.py index cbc3b8b3cc70407eab37a9b5a72e5afd93825389..84b21d80a41ef77a67347bfcff7c1c9be12a631c 100755 --- a/ippisite/manage.py +++ b/ippisite/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys diff --git a/ippisite/requirements.txt b/ippisite/requirements.txt index ab4ff146a1259b80447fe890649845b313623c8e..683a9367b3f66fc6ad5111239d579439db23969b 100644 --- a/ippisite/requirements.txt +++ b/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