Skip to content

Commit 7418d6d

Browse files
committed
Replace JavaScript / redirect with proper server redirect
1 parent e85c179 commit 7418d6d

File tree

4 files changed

+44
-43
lines changed

4 files changed

+44
-43
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ RUN curl -Lo /usr/local/bin/faToTwoBit https://hgdownload.soe.ucsc.edu/admin/exe
3838
COPY config-template /var/www/html/config
3939
WORKDIR /var/www/html
4040
RUN echo -e "classicMenu = true\ninclude += data/datasets.conf\n\n[aboutThisBrowser]\ntitle = FORCAST" >> jbrowse/jbrowse.conf
41+
RUN a2enmod rewrite
4142
CMD service mongodb start && exec apache2-foreground

docker-compose.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ services:
1818
- ./jbrowse/plugins/ColorByCDS:/var/www/html/jbrowse/plugins/ColorByCDS
1919
- ./jbrowse/plugins/ExportSequence:/var/www/html/jbrowse/plugins/ExportSequence
2020
- ./crispr-icon.png:/var/www/html/crispr-icon.png
21-
- ./index.html:/var/www/html/index.html
2221
- mongodb:/var/lib/mongodb
2322
volumes:
2423
mongodb:

index.html

-3
This file was deleted.

sites-enabled/000-default.conf

+43-39
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
1-
<VirtualHost *:80>
2-
# The ServerName directive sets the request scheme, hostname and port that
3-
# the server uses to identify itself. This is used when creating
4-
# redirection URLs. In the context of virtual hosts, the ServerName
5-
# specifies what hostname must appear in the request's Host: header to
6-
# match this virtual host. For the default virtual host (this file) this
7-
# value is not decisive as it is used as a last resort host regardless.
8-
# However, you must set it for any further virtual host explicitly.
9-
#ServerName www.example.com
10-
11-
ServerAdmin webmaster@localhost
12-
DocumentRoot /var/www/html
13-
14-
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
15-
# error, crit, alert, emerg.
16-
# It is also possible to configure the loglevel for particular
17-
# modules, e.g.
18-
#LogLevel info ssl:warn
19-
20-
ErrorLog ${APACHE_LOG_DIR}/error.log
21-
CustomLog ${APACHE_LOG_DIR}/access.log combined
22-
23-
# For most configuration files from conf-available/, which are
24-
# enabled or disabled at a global level, it is possible to
25-
# include a line for only one particular virtual host. For example the
26-
# following line enables the CGI configuration for this host only
27-
# after it has been globally disabled with "a2disconf".
28-
#Include conf-available/serve-cgi-bin.conf
29-
30-
# FORCAST modification from base configuration
31-
<Directory "/var/www/html">
32-
Options +ExecCGI
33-
AddHandler cgi-script .py
34-
Require all granted
35-
</Directory>
36-
# End modification
37-
</VirtualHost>
38-
39-
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
1+
<VirtualHost *:80>
2+
# The ServerName directive sets the request scheme, hostname and port that
3+
# the server uses to identify itself. This is used when creating
4+
# redirection URLs. In the context of virtual hosts, the ServerName
5+
# specifies what hostname must appear in the request's Host: header to
6+
# match this virtual host. For the default virtual host (this file) this
7+
# value is not decisive as it is used as a last resort host regardless.
8+
# However, you must set it for any further virtual host explicitly.
9+
#ServerName www.example.com
10+
11+
ServerAdmin webmaster@localhost
12+
DocumentRoot /var/www/html
13+
14+
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
15+
# error, crit, alert, emerg.
16+
# It is also possible to configure the loglevel for particular
17+
# modules, e.g.
18+
#LogLevel info ssl:warn
19+
20+
ErrorLog ${APACHE_LOG_DIR}/error.log
21+
CustomLog ${APACHE_LOG_DIR}/access.log combined
22+
23+
# For most configuration files from conf-available/, which are
24+
# enabled or disabled at a global level, it is possible to
25+
# include a line for only one particular virtual host. For example the
26+
# following line enables the CGI configuration for this host only
27+
# after it has been globally disabled with "a2disconf".
28+
#Include conf-available/serve-cgi-bin.conf
29+
30+
# FORCAST modification from base configuration
31+
RewriteEngine on
32+
RewriteCond %{REQUEST_URI} ^/$
33+
RewriteRule (.*) /src/landing-page/ [R=301,L]
34+
35+
<Directory "/var/www/html">
36+
Options +ExecCGI
37+
AddHandler cgi-script .py
38+
Require all granted
39+
</Directory>
40+
# End modification
41+
</VirtualHost>
42+
43+
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

0 commit comments

Comments
 (0)