Skip to content
Snippets Groups Projects
Commit 41c6bb11 authored by Bryan BRANCOTTE's avatar Bryan BRANCOTTE
Browse files

Merge branch 'master' into wizard_form

parents 4582ae29 5826d95b
Branches master
No related tags found
No related merge requests found
Pipeline #9255 passed
......@@ -51,3 +51,5 @@ deploy-webserver:
- cd ansible
- whoami
- ansible-playbook -vvv -i ./hosts_deploy deploy.yaml --extra-vars "deploy_user_name=ippidb repo_api_token=JZS-4cH7bWkFkHa2rAVf marvin_license_b64=$MARVINJS_LICENSE"
only:
- master
\ No newline at end of file
......@@ -50,10 +50,10 @@
- name: Install RPMs for openbabel.
yum:
name:
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-libs-2.4.1-15.PR1829.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-2.4.1-15.PR1829.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-devel-2.4.1-15.PR1829.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/python3-openbabel-2.4.1-15.PR1829.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-libs-2.4.1-15.PR1902.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-2.4.1-15.PR1902.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-devel-2.4.1-15.PR1902.py3.el7.x86_64.rpm
- https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/python3-openbabel-2.4.1-15.PR1902.py3.el7.x86_64.rpm
state: present
- name: install graphviz-devel
yum: name=graphviz-devel state=present update_cache=yes
......@@ -124,25 +124,33 @@
command: "collectstatic"
app_path: "/home/{{ deploy_user_name }}/ippidb-web/ippisite"
settings: "ippisite.{{ ansible_hostname }}_settings"
environment:
BABEL_LIBDIR: '/usr/lib64/openbabel/'
- name: create mod_wsgi configuration
django_manage:
command: "runmodwsgi --setup-only --port=80 --user ippidb --group wheel --server-root=/etc/ippidb-80"
app_path: "/home/{{ deploy_user_name }}/ippidb-web/ippisite"
settings: "ippisite.{{ ansible_hostname }}_settings"
- name: add line in generated WSGI handler script to set DJANGO_SETTINGS_MODULE
environment:
BABEL_LIBDIR: '/usr/lib64/openbabel/'
- name: add line in generated WSGI handler script to set DJANGO_SETTINGS_MODULE and BABEL_LIBDIR for openbabel formats
blockinfile:
path: /etc/ippidb-80/handler.wsgi
insertbefore: BOF
content: |
# added by ansible deployment script to use the right django settings file
# and set correctly the openbabel formats directory
import os
os.environ['DJANGO_SETTINGS_MODULE'] = 'ippisite.hub16_settings'
os.environ['BABEL_LIBDIR'] = '/usr/lib64/openbabel/'
- name: create or update database
become_user: "{{ deploy_user_name }}"
django_manage:
command: "migrate"
app_path: "/home/{{ deploy_user_name }}/ippidb-web/ippisite"
settings: "ippisite.{{ ansible_hostname }}_settings"
environment:
BABEL_LIBDIR: '/usr/lib64/openbabel/'
# FIXME: this should obviously be removed before switching to prod. env.
- name: install passlib for htpasswd in ansible
yum: name=python-passlib state=installed
......
......@@ -6,6 +6,8 @@ django-extensions
django-formtools
django-debug-toolbar
django-allauth
# import scripts
pandas==0.22.0
# web services
bioservices
bioblend
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment