Restore base domain to themes by host

galaxyproject · Aug 21, 2024 · caf1c89 · caf1c89
1 parent 610de30
commit caf1c89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -346,6 +346,7 @@ galaxy_app_config_default:
     {% endif %} }
   themes_config_file_by_host: >
     { {% if galaxy_manage_themes and galaxy_themes_subdomains %}
+    '{{ galaxy_themes_instance_domain }}': '{{ galaxy_config.galaxy.themes_config_file | default((galaxy_config_dir, "themes_conf.yml") | path_join) }}',
     {% for subdomain in galaxy_themes_subdomains %}
     {% if subdomain.theme is defined %}
     '{{ subdomain.name  }}.{{ galaxy_themes_instance_domain}}': 'themes_conf-{{ subdomain.name }}.yml',

diff --git a/tasks/themes.yml b/tasks/themes.yml
@@ -19,7 +19,7 @@
     - name: Write base themes config
       ansible.builtin.copy:
         content: "{{ galaxy_themes | to_yaml }}"
-        dest: "{{ galaxy_config_merged.themes_config_file | default((galaxy_config_dir, 'themes_conf.yml') | path_join) }}"
+        dest: "{{ galaxy_config_merged.galaxy.themes_config_file | default((galaxy_config_dir, 'themes_conf.yml') | path_join) }}"
         mode: "0644"
 
     - name: Write subdomain themes configs