Skip to content

Commit

Permalink
sessionFile param
Browse files Browse the repository at this point in the history
  • Loading branch information
lidaof committed Aug 21, 2019
1 parent a569f0c commit 168d7c1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
4 changes: 4 additions & 0 deletions docs/datahub.rst
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ url
.. caution:: Each user-provided ``url`` must link to a publically available website, without password
protection, so that the browser can read in the file.

.. note:: ``url`` can use a relative child path to the datahub url, say you have a file ``a.bigWig`` with your
datahub ``http://your.host/your.hub.json``, when you add the track entry for ``a.bigWig``, the ``url`` can
be either ``http://your.host/a.bigWig`` or just ``a.bigWig``.

showOnHubLoad
~~~~~~~~~~~~~

Expand Down
15 changes: 7 additions & 8 deletions docs/tracks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Quoted from MDN_::
Cross-Origin Resource Sharing (CORS) is a mechanism that uses additional
HTTP headers to tell a browser to let a web application running at
one origin (domain) have permission to access selected resources
from a server at a different origin. A web application makes
from a server at a different origin. A web application makes
cross-origin HTTP request when it requests a resource that has
a different origin (domain, protocol, and port) than its own origin.

Expand All @@ -29,20 +29,19 @@ Enable CORS on Apache2 under Ubuntu
For an Apache web server in Ubuntu this setup (add this to the enabled .conf file) would work::

Header always set Access-Control-Allow-Origin "*"
Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
Header always set Access-Control-Max-Age 1000
Header always set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"

Header always set Access-Control-Allow-Headers: Range
Header always set Access-Control-Max-Age: 86400
Then restart your Apache server.

Enable CORS on Apache2 under CentOS
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Try add this to the main configuration file ``/etc/httpd/conf/httpd.conf``::

Header set Access-Control-Allow-Origin "*"
Header set Access-Control-Allow-Headers: Range
Header set Access-Control-Max-Age: 86400
Header always set Access-Control-Allow-Origin "*"
Header always set Access-Control-Allow-Headers: Range
Header always set Access-Control-Max-Age: 86400

.. image:: _static/centos_cors1.png

Expand Down
7 changes: 7 additions & 0 deletions docs/url.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ Specify a session bundle ID in URL.

Example: ``?genome=hg19&bundle=session-bundle-id``

sessionFile
-----------

Specify a session file in URL.

Example: ``?sessionFile=https://wangftp.wustl.edu/~dli/test/eg-session--1692c5f0-c392-11e9-829c-912864922e1e.json``

hicUrl
-------

Expand Down

0 comments on commit 168d7c1

Please sign in to comment.