diff --git a/files/galaxy/subdomains/microbiology/static/welcome.html b/files/galaxy/subdomains/microbiology/static/welcome.html
new file mode 100644
index 000000000..fb372952a
--- /dev/null
+++ b/files/galaxy/subdomains/microbiology/static/welcome.html
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/files/traefik/rules/template-subdomains.yml b/files/traefik/rules/template-subdomains.yml
index 413cfd7c7..16c8f4a0c 100644
--- a/files/traefik/rules/template-subdomains.yml
+++ b/files/traefik/rules/template-subdomains.yml
@@ -25,6 +25,7 @@ http:
{{template "subdomain" "metagenomics"}}
{{template "subdomain" "microbiome"}}
{{template "subdomain" "microgalaxy"}}
+{{template "subdomain" "microbiology"}}
{{template "subdomain" "rna"}}
{{template "subdomain" "graphclust"}}
{{template "subdomain" "ecology"}}
diff --git a/group_vars/gxconfig.yml b/group_vars/gxconfig.yml
index ea96c6e54..0e7fc1bde 100644
--- a/group_vars/gxconfig.yml
+++ b/group_vars/gxconfig.yml
@@ -1062,6 +1062,7 @@ base_app_main: &BASE_APP_MAIN
'metagenomics.usegalaxy.eu': Metagenomics
'microbiome.usegalaxy.eu': Microbiome
'microgalaxy.usegalaxy.eu': microGalaxy
+ 'microbiology.usegalaxy.eu': Microbiology
'rna.usegalaxy.eu': RNA
'graphclust.usegalaxy.eu': GraphClust
'ecology.usegalaxy.eu': Ecology
diff --git a/group_vars/sn06/subdomains.yml b/group_vars/sn06/subdomains.yml
index 63f09d5ee..8c96263fd 100644
--- a/group_vars/sn06/subdomains.yml
+++ b/group_vars/sn06/subdomains.yml
@@ -96,6 +96,7 @@ galaxy_themes_subdomains:
- name: metagenomics
- name: microbiome
- name: microgalaxy
+ - name: microbiology
- name: rna
- name: graphclust
- name: ecology
diff --git a/templates/galaxy/config/global_host_filters.py.j2 b/templates/galaxy/config/global_host_filters.py.j2
index c9d3519b6..100433263 100644
--- a/templates/galaxy/config/global_host_filters.py.j2
+++ b/templates/galaxy/config/global_host_filters.py.j2
@@ -22,11 +22,11 @@ def per_host_tool_labels( context, label ):
# hide genomics label in the single cell subdomain
if label.id == "genomics_label" and subdomain == "singlecell":
return False
-
+
# show earth-system labels only in that subdomain
if label.id.startswith("earth-system-label"):
return subdomain == "earth-system"
-
+
# Core tools used by all virtual hosts.
valid_labels = [ "file_meta_label", "general_text_label"]
general_ngs_labels = [ "genomics_label" ]
@@ -113,6 +113,10 @@ DOMAIN_SECTIONS = {
"multiple_alignments", "assembly", "annotation",
"graph_display_data", "metagenomic_analysis", "mothur", "qiime",
"biom_manipulation", "interactivetools", "nanopore", "ncbi_blast", 'metabolomics'],
+ 'microbiology': GENERAL_NGS_SECTIONS + ["fasta_fastq_manipulation",
+ "multiple_alignments", "assembly", "annotation",
+ "graph_display_data", "metagenomic_analysis", "mothur", "qiime",
+ "biom_manipulation", "interactivetools", "nanopore", "ncbi_blast", 'metabolomics'],
'rna': GENERAL_NGS_SECTIONS + ["rna_seq", "annotation", "rna_analysis",
"graph_display_data"],
'singlecell': [
@@ -159,11 +163,11 @@ DOMAIN_SECTIONS = {
'materials': ['muon_spectroscopy', 'xas'],
'aqua': ["climate_analysis", "gis_data_handling", "graph_display_data", "interactivetools", "machine_learning"],
'earth-system': [
- "earth-system-section-watercoastal",
- "earth-system-section-earthcritical",
- "earth-system-section-volcano",
- "earth-system-section-biogeo",
- "earth-system-section-marineomics",
+ "earth-system-section-watercoastal",
+ "earth-system-section-earthcritical",
+ "earth-system-section-volcano",
+ "earth-system-section-biogeo",
+ "earth-system-section-marineomics",
"earth-system-section-interactivetools",
"biodiversity_data_exploration",
"annotation",
diff --git a/templates/nginx/galaxy-main.j2 b/templates/nginx/galaxy-main.j2
index 83f246252..30442ed05 100644
--- a/templates/nginx/galaxy-main.j2
+++ b/templates/nginx/galaxy-main.j2
@@ -287,16 +287,6 @@ server {
add_header X-Robots-Tag none;
client_max_body_size 1G; # aka max upload size, defaults to 1M
-
- # BY-COVID federated analysis demonstration data (restricted access demo)
- location /federated_analysis_data {
- alias /data/dnb01/federated_analysis_demo_data/;
- allow 10.5.68.0/24;
- # BE instance IPs
- allow 10.113.3.8;
- allow 10.113.3.13;
- deny all;
- }
}
server {
@@ -307,3 +297,13 @@ server {
return 302 $scheme://singlecell.usegalaxy.eu$request_uri;
}
+
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+
+ server_name microgalaxy.usegalaxy.eu microbiome.usegalaxy.eu;
+
+ return 302 $scheme://microbiology.usegalaxy.eu$request_uri;
+}