Skip to content

Commit c579a1a

Browse files
author
ens_adm02
committed
Merging postreleasefix/115 to main
* postreleasefix/115: Improvements for mirror availability (#1125)
2 parents 36e1afe + 7c387fa commit c579a1a

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

conf/httpd.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ SecDataDir /tmp
9494
SecRule REQUEST_METHOD !^POST$ allow,nolog,id:1
9595
SecAction initcol:ip=%{REQUEST_HEADERS.X-Cluster-Client-Ip},pass,nolog,id:2
9696
SecAction "phase:5,deprecatevar:ip.biomartcounter=1/1,pass,nolog,id:3"
97-
SecRule IP:BIOMARTCOUNTER "@gt 100" "phase:2,pause:300,deny,status:509,setenv:RATELIMITED,skip:1,nolog,id:4"
97+
SecRule IP:BIOMARTCOUNTER "@gt 100" "phase:2,deny,status:509,setenv:RATELIMITED,skip:1,log,id:4"
9898
SecAction "phase:2,pass,setvar:ip.biomartcounter=+1,nolog,id:5"
9999
Header always set Retry-After "10" env=RATELIMITED
100100
</LocationMatch>
@@ -223,7 +223,7 @@ $MaxSpareServers = $SiteDefs::ENSEMBL_MAX_SPARE_SERVERS;
223223
$MaxRequestsPerChild = 1000;
224224
$StartServers = $SiteDefs::ENSEMBL_START_SERVERS;
225225

226-
@Listen = ($SiteDefs::ENSEMBL_PORT);
226+
@Listen = ("127.0.0.1:" . $SiteDefs::ENSEMBL_PORT);
227227

228228
$ServerAdmin = $SiteDefs::ENSEMBL_SERVERADMIN;
229229
$ServerName = $SiteDefs::ENSEMBL_SERVERNAME;
@@ -399,7 +399,7 @@ fix_lvalues("EnsEMBL::",\%EnsEMBL::);
399399
# Apache-style Config
400400
#######################
401401
ServerTokens prod
402-
Timeout 300
402+
Timeout 30
403403
<IfDefine PERLDB>
404404
KeepAlive Off
405405
MaxClients 1

conf/ini-files/DEFAULTS.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ GEM_J_POP = https://togovar.biosciencedbc.jp/doc/datasets/gem_
387387
GEM_J_POP_USE = https://togovar.biosciencedbc.jp/doc/datasets/gem_j_wga#terms
388388
GENE3D = https://www.ebi.ac.uk/interpro/entry/cathgene3d/###ID###
389389
GIANT = http://www.broadinstitute.org/collaboration/giant/index.php/Main_Page
390-
GNOMAD_SV = https://gnomad.broadinstitute.org/variant/###ID###?dataset=gnomad_sv_r4
391390
HAPMAP = http://www.hapmap.org/cgi-perl/secure/gbrowse/snp_details/hapmap?class=SNP;name=###ID###
392391
HBVAR = http://globin.bx.psu.edu/cgi-bin/hbvar/query_vars3?mode=output&display_format=page&i=###ID###
393392
HGMD-PUBLIC = http://www.hgmd.cf.ac.uk/ac/index.php

modules/EnsEMBL/Web/Controller/Psychic.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sub _psychic {
8888

8989
return "//www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$query" if $dest_site eq 'ebi';
9090
return "//www.sanger.ac.uk/search?db=allsanger&t=$query" if $dest_site eq 'sanger';
91-
return "//www.ensemblgenomes.org/search/?query=$query" if $dest_site eq 'ensembl_genomes';
91+
return "//www.ensemblgenomes.org/search/eg/$query" if $dest_site eq 'ensembl_genomes';
9292

9393
my $extra = '';
9494
if(@extra) {

0 commit comments

Comments
 (0)