From e00b1d099be161a6c960fe4ff1ada71c8bb49639 Mon Sep 17 00:00:00 2001 From: cat-bro Date: Tue, 10 Oct 2023 21:07:47 +1100 Subject: [PATCH] make a variable of base css path --- defaults/main.yml | 1 + tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2487d26..1ebd3a6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,6 +2,7 @@ galaxy_subsite_default_welcome: "https://galaxyproject.org" galaxy_subsite_base_domain: "usegalaxy.org" galaxy_subsite_dir: /srv/subsite galaxy_subsite_base_css: "#masthead { background-color: #2c3143;}" # Standard Galaxy colour. Override for others +galaxy_subsite_base_stylesheet: "{{ galaxy_server_dir }}/static/dist/base.css" galaxy_subsites: [] # - name: test # Accessible at test.usegalaxy.org # brand: Testing diff --git a/tasks/main.yml b/tasks/main.yml index 8798f76..5eb3ef2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -42,13 +42,13 @@ # Main css file that's used as a fallback. - name: Create main site CSS ansible.builtin.shell: | - cat {{ galaxy_server_dir }}/static/style/base.css {{ galaxy_subsite_dir }}/{{ galaxy_subsite_base_domain }}-custom.css \ + cat {{ galaxy_subsite_base_stylesheet }} {{ galaxy_subsite_dir }}/{{ galaxy_subsite_base_domain }}-custom.css \ > {{ galaxy_subsite_dir }}/{{ galaxy_subsite_base_domain }}.css # Make the final CSS files. - name: Merge CSS files for subsites ansible.builtin.shell: | - cat {{ galaxy_server_dir }}/static/style/base.css {{ galaxy_subsite_dir }}/{{ item.name }}.{{ galaxy_subsite_base_domain }}-custom.css \ + cat {{ galaxy_subsite_base_stylesheet }} {{ galaxy_subsite_dir }}/{{ item.name }}.{{ galaxy_subsite_base_domain }}-custom.css \ > {{ galaxy_subsite_dir }}/{{ item.name }}.{{ galaxy_subsite_base_domain }}.css with_items: "{{ galaxy_subsites }}"