Commit 4d797bd3 authored by Mathieu Giraud's avatar Mathieu Giraud

*: rbx doesn't exist anymore

parent 8a592d09
......@@ -10,7 +10,7 @@ functional: ../../doc/analysis-example1.vidjil
sh launch_functional_tests
functional-rbx: ../../doc/analysis-example1.vidjil
LIVE_SERVER=http://rbx.vidjil.org/browser/ ruby test_browser.rb
LIVE_SERVER=http://app.vidjil.org/browser/ ruby test_browser.rb
phantomjs:
cd QUnit ; phantomjs phantom_test.js
......
......@@ -64,7 +64,7 @@ able to open =.vidjil= files with the =import/export= menu.
To work with actual data, the easiest way is to copy =js/conf.js.sample= to =js/conf.js=.
This will unlock the =patients= menu and allow your local browser
to access the public server at http://rbx.vidjil.org/.
to access the public server at http://app.vidjil.org/.
** Browser API
......@@ -73,9 +73,9 @@ The browser can be opened on a data file specified from a =data= attribute,
and optionally on an analysis file specified from a =analysis= attribute,
as in the following URLs on our test server:
- http://rbx.vidjil.org/browser/?data=test.vidjil
- http://rbx.vidjil.org/browser/?data=test.vidjil&analysis=test.analysis
- http://rbx.vidjil.org/browser/?data=http://rbx.vidjil.org/browser/test.vidjil
- http://app.vidjil.org/browser/?data=test.vidjil
- http://app.vidjil.org/browser/?data=test.vidjil&analysis=test.analysis
- http://app.vidjil.org/browser/?data=http://app.vidjil.org/browser/test.vidjil
Both GET and POST requests are accepted.
Note that the =browser/index.html= file and the =.vidjil/.analysis= files should be hosted on the same server.
......
......@@ -6,7 +6,7 @@
### Email notifications for server errors
SMTP_SERVER = 'localhost'
# SMTP_SERVER = 'logging' # no mail
FROM_EMAIL = 'rbx@vidjil.org'
FROM_EMAIL = 'notifications@vidjil.org'
ADMIN_EMAILS = ['notifications@vidjil.org']
### address for the sql database
......
......@@ -6,7 +6,7 @@
DIR_BACKUP=/mnt/data/backup/vidjil/
# Remote server
VIDJIL_SERVER=vidjil-bak@rbx.vidjil.org
VIDJIL_SERVER=vidjil-bak@db.vidjil.org
options=$1
filename=$(ssh ${VIDJIL_SERVER} "cd /home/vidjil/server; sh ./backup.sh ${options} ~" | tail -1)
......
......@@ -3,7 +3,7 @@ import os
import os.path
def rbx_link(patient_id, config_id):
return 'http://rbx.vidjil.org/browser/?patient=%d&config=%d' % (patient_id,config_id)
return 'http://app.vidjil.org/browser/?patient=%d&config=%d' % (patient_id,config_id)
def print_patient_info(patient_id):
patient = db.patient[patient_id]
......
......@@ -35,7 +35,7 @@ def print_fuse_files(fused_files):
else:
results = ' '.join([defs.DIR_RESULTS+'{0}'.format(f) for f in result_filenames])
comments = ' '.join(sequence_filenames)
print ("python %s/fuse.py -o %s/%s -t 100 %s # %s http://rbx.vidjil.org/browser/index.html?sample_set_id=%d&config=%d"
print ("python %s/fuse.py -o %s/%s -t 100 %s # %s http://app.vidjil.org/browser/index.html?sample_set_id=%d&config=%d"
% (os.path.abspath(defs.DIR_FUSE), defs.DIR_RESULTS,
fused.fused_file, results, comments,
fused.sample_set_id, fused.config_id))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment