Commit 87340c62 authored by Ryan Herbert's avatar Ryan Herbert Committed by marc duez

back to relative imports

parent 2c0fb489
......@@ -27,16 +27,16 @@
<link rel="shortcut icon" href="./images/favicon-v.ico" type="image/x-icon">
<link rel="icon" href="./images/favicon-v.ico" type="image/x-icon">
<link rel="stylesheet" type="text/css" href="/css/fonts/ubuntu/stylesheet.css" />
<link rel="stylesheet" type="text/css" href="/css/fonts/ubuntu-mono/stylesheet.css" />
<link rel="stylesheet" type="text/css" href="/css/icons/fontello/css/fontello.css" />
<link rel="stylesheet" type="text/css" href="/css/icons/fontello/css/animation.css" />
<link rel="stylesheet" href="/css/vmi/vmi.css" />
<link id="palette" rel="stylesheet" type="text/css" href="/css/light.css" />
<link id="seg_highlight" rel="stylesheet" type="text/css" href="/css/segmenter_highlight.css" />
<link rel="stylesheet" href="/css/jstree_themes/default/style.min.css" />
<script data-main="/js/app.js" src="/js/lib/require.js"></script>
<link rel="stylesheet" type="text/css" href="css/fonts/ubuntu/stylesheet.css" />
<link rel="stylesheet" type="text/css" href="css/fonts/ubuntu-mono/stylesheet.css" />
<link rel="stylesheet" type="text/css" href="css/icons/fontello/css/fontello.css" />
<link rel="stylesheet" type="text/css" href="css/icons/fontello/css/animation.css" />
<link rel="stylesheet" href="css/vmi/vmi.css" />
<link id="palette" rel="stylesheet" type="text/css" href="css/light.css" />
<link id="seg_highlight" rel="stylesheet" type="text/css" href="css/segmenter_highlight.css" />
<link rel="stylesheet" href="css/jstree_themes/default/style.min.css" />
<script data-main="js/app.js" src="js/lib/require.js"></script>
</head>
......
var DEFAULT_DB_ADDRESS="https://db.vidjil.org/vidjil/";
requirejs.config({
baseUrl: '/js/lib',
baseUrl: './js/lib',
paths: {
app: '',
jquery: 'jquery-3.3.1.min',
......
......@@ -26,16 +26,6 @@ server {
uwsgi_max_temp_file_size 20480m;
location / {
rewrite /([0-9]+)/([0-9]+)(/+) /?set=$1&conf=$2 break;
root /usr/share/vidjil;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /vidjil {
include /etc/nginx/conf.d/web2py/uwsgi.conf;
proxy_read_timeout 600;
client_max_body_size 20G;
......@@ -50,6 +40,16 @@ server {
expires 1h;
error_page 405 = $1;
location /browser {
rewrite /browser/([0-9]+)/([0-9]+)(/+) /browser/?set=$1&conf=$2 break;
rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect;
root /usr/share/vidjil;
expires 1h;
add_header Cache-Control must-revalidate;
error_page 405 = $uri;
}
location /germline {
......
......@@ -112,15 +112,9 @@ server {
## if you serve static files through https, copy here the section
## from the previous server instance to manage static files
location ~ ^/(css|js|images|test) {
root /usr/share/vidjil/browser/;
expires 1h;
error_page 405 = $uri;
}
location /browser {
rewrite /browser/([0-9]+)/([0-9]+)(/+) /browser/?set=$1&conf=$2 break;
rewrite /browser/([0-9/]+)/(css|js|images|test)/(.*) /browser/$2/$3 redirect;
root $CWD/../;
expires 1h;
......
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