Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ippidb-web
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iPPIDB
ippidb-web
Commits
41c6bb11
Commit
41c6bb11
authored
6 years ago
by
Bryan BRANCOTTE
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into wizard_form
parents
4582ae29
5826d95b
Branches
master
No related tags found
No related merge requests found
Pipeline
#9255
passed
6 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
ansible/deploy.yaml
+13
-5
13 additions, 5 deletions
ansible/deploy.yaml
ippisite/requirements-core.txt
+2
-0
2 additions, 0 deletions
ippisite/requirements-core.txt
with
17 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
0
View file @
41c6bb11
...
...
@@ -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
This diff is collapsed.
Click to expand it.
ansible/deploy.yaml
+
13
−
5
View file @
41c6bb11
...
...
@@ -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.PR1
829
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-2.4.1-15.PR1
829
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-devel-2.4.1-15.PR1
829
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/python3-openbabel-2.4.1-15.PR1
829
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-libs-2.4.1-15.PR1
902
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-2.4.1-15.PR1
902
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/openbabel-devel-2.4.1-15.PR1
902
.py3.el7.x86_64.rpm
-
https://gitlab.pasteur.fr/hub/openbabel4ippidb/raw/master/rpmbuild/RPMS/x86_64/python3-openbabel-2.4.1-15.PR1
902
.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
...
...
This diff is collapsed.
Click to expand it.
ippisite/requirements-core.txt
+
2
−
0
View file @
41c6bb11
...
...
@@ -6,6 +6,8 @@ django-extensions
django-formtools
django-debug-toolbar
django-allauth
# import scripts
pandas==0.22.0
# web services
bioservices
bioblend
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment