[WIP] Remove subdomains role

dev_playbook.yml

@@ -44,7 +44,7 @@
     - role: galaxyproject.miniconda
       become: true
       become_user: galaxy
-    - usegalaxy_eu.galaxy_subdomains
+    # - usegalaxy_eu.galaxy_subdomains
     - webhooks
     - nginx-upload-module
     - galaxyproject.nginx

files/galaxy/subdomains/genome/themes/genome.yml

@@ -0,0 +1,14 @@
+genome:
+  masthead:
+    color: "#3a3e87"
+    text:
+      color: "#f8f9fa"
+      hover: gold
+      active: white
+    link:
+      color: transparent
+      hover: transparent
+      active: "#2c3067"
+    logo:
+      img: "/static/favicon.svg"
+      img-secondary: null

files/galaxy/subdomains/proteomics/themes/proteomics.yml

@@ -0,0 +1,14 @@
+proteomics:
+  masthead:
+    color: "#542a95"
+    text:
+      color: "#f8f9fa"
+      hover: gold
+      active: white
+    link:
+      color: transparent
+      hover: transparent
+      active: "#402668"
+    logo:
+      img: "/static/favicon.svg"
+      img-secondary: null

group_vars/galaxyservers.yml

@@ -327,12 +327,12 @@ group_galaxy_config_files:
     dest: "{{ galaxy_config_dir}}/oidc_config.xml"
   - src: "{{ galaxy_config_file_src_dir }}/config/email_domain_blocklist.conf"
     dest: "{{ galaxy_config_dir }}/email_domain_blocklist.conf"
-  - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_main.yml"
-    dest: "{{ galaxy_config_dir }}/themes/themes_main.yml"
-  - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_genome.yml"
-    dest: "{{ galaxy_config_dir }}/themes/themes_genome.yml"
-  - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_proteomics.yml"
-    dest: "{{ galaxy_config_dir }}/themes/themes_proteomics.yml"
+  # - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_main.yml"
+  #   dest: "{{ galaxy_config_dir }}/themes/themes_main.yml"
+  # - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_genome.yml"
+  #   dest: "{{ galaxy_config_dir }}/themes/themes_genome.yml"
+  # - src: "{{ galaxy_config_file_src_dir }}/config/themes/themes_proteomics.yml"
+  #   dest: "{{ galaxy_config_dir }}/themes/themes_proteomics.yml"
   - src: "{{ galaxy_config_file_src_dir }}/images/au/favicon/favicon.ico"
     dest: "{{ galaxy_server_dir }}/static/favicon.ico"
 

host_vars/dev.gvl.org.au.yml

@@ -186,6 +186,11 @@ host_galaxy_config: # renamed from __galaxy_config
     user_activation_on: true
     activation_email: <[email protected]>
     panel_views_dir: "{{ galaxy_config_dir }}/tool_panel_filters"
+
+    brand_by_host:
+      dev.gvl.org.au: Australia Dev
+      genome.dev.gvl.org.au: Genome lab
+      proteomics.dev.gvl.org.au: Proteomics lab
     default_panel_view_by_host:
       proteomics.dev.gvl.org.au: proteomics
     themes_config_file_by_host:
@@ -350,57 +355,76 @@ pulsar_docker_volumes: "{{ pulsar_docker_volumes_list | join(',') }}"
 
 singularity_default_container_id: "/cvmfs/singularity.galaxyproject.org/all/python:3.8.3"
 
-# multisite stuff
-
-galaxy_subsite_base_domain: "dev.gvl.org.au"
-galaxy_subsite_default_welcome: "https://site.usegalaxy.org.au"
-galaxy_subsite_dir: /mnt/galaxy/subsites
-#galaxy_subsite_base_css: '#masthead { background-color: #003399;}'
-galaxy_subsites:
+# # multisite stuff
+
+# galaxy_subsite_base_domain: "dev.gvl.org.au"
+# galaxy_subsite_default_welcome: "https://site.usegalaxy.org.au"
+# galaxy_subsite_dir: /mnt/galaxy/subsites
+# #galaxy_subsite_base_css: '#masthead { background-color: #003399;}'
+# galaxy_subsites:
+#   - name: genome
+#     brand: Genome lab
+#     iframe: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/genome/main.yml"
+#     # If wallpaper is true, then files/subsites/{name}.png will be copied to
+#     # /static/dist/{name}.png, and can be used exactly like that in the CSS.
+#     wallpaper: false
+#     tool_sections:
+#       - "hicexplorer"
+#       - "plots"
+#       - "assembly"
+#       - "annotation"
+#       - "phylogenetics"
+#       - "multiple_alignments"
+#     custom_css: |
+#       #masthead .navbar-nav>li.active {
+#         background: #2c3067 !important;
+#       }
+#       #masthead {
+#         background: #3a3e87 !important;
+#       }
+#       #masthead a.navbar-brand::after {
+#           content: "Australia - Genome Lab";
+#       }
+#       #masthead .navbar-text {
+#           display: none;
+#       }
+#   - name: proteomics
+#     brand: Proteomics lab
+#     iframe: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/proteomics/main.yml"
+#     wallpaper: false
+#     tool_sections: []
+#     custom_css: |
+#       #masthead .navbar-nav>li.active {
+#         background: #402668 !important;
+#       }
+#       #masthead {
+#         background: #542a95 !important;
+#       }
+#       #masthead a.navbar-brand::after {
+#         content: "Australia - Proteomics Lab";
+#       }
+#       #masthead .navbar-text {
+#         display: none;
+#       }
+
+# themes the way they work now
+
+galaxy_themes_static_path: "{{ galaxy_root }}/server"
+galaxy_themes_static_dir: "{{ galaxy_root }}/server/static"
+
+galaxy_manage_themes: true
+galaxy_manage_subdomain_static: true
+galaxy_themes_ansible_file_path: files/galaxy/subdomains
+# galaxy_themes_welcome_url_prefix: https://usegalaxy-eu.github.io/index-
+galaxy_themes_subdomains:
   - name: genome
-    brand: Genome lab
-    iframe: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/genome/main.yml"
-    # If wallpaper is true, then files/subsites/{name}.png will be copied to
-    # /static/dist/{name}.png, and can be used exactly like that in the CSS.
-    wallpaper: false
-    tool_sections:
-      - "hicexplorer"
-      - "plots"
-      - "assembly"
-      - "annotation"
-      - "phylogenetics"
-      - "multiple_alignments"
-    custom_css: |
-      #masthead .navbar-nav>li.active {
-        background: #2c3067 !important;
-      }
-      #masthead {
-        background: #3a3e87 !important;
-      }
-      #masthead a.navbar-brand::after {
-          content: "Australia - Genome Lab";
-      }
-      #masthead .navbar-text {
-          display: none;
-      }
+    welcome_url: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/genome/main.yml"
   - name: proteomics
-    brand: Proteomics lab
-    iframe: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/proteomics/main.yml"
-    wallpaper: false
-    tool_sections: []
-    custom_css: |
-      #masthead .navbar-nav>li.active {
-        background: #402668 !important;
-      }
-      #masthead {
-        background: #542a95 !important;
-      }
-      #masthead a.navbar-brand::after {
-        content: "Australia - Proteomics Lab";
-      }
-      #masthead .navbar-text {
-        display: none;
-      }
+    welcome_url: "https://dev-site.gvl.org.au/lab/export?content_root=https://dev-site.gvl.org.au/static/home/labs/proteomics/main.yml"
+static_galaxy_themes_keys: # leave this variable out to use everything in galaxy_themes_subdomains
+  - genome
+  - proteomics
+
 
 webhook_plugins:
   - subdomain_switcher

requirements.yml

@@ -4,7 +4,11 @@ collections:
 
 roles:
 - name: galaxyproject.galaxy
-  version: 0.10.21
+  # version: 0.10.21
+  # src: https://github.com/galaxyproject/ansible-galaxy
+  # version: ffb86cd
+  src: https://github.com/cat-bro/ansible-galaxy
+  version: allow_customisation_of__welcome_urls_for_subdomains
 - name: galaxyproject.nginx
   version: 0.7.1
 - name: galaxyproject.postgresql