diff --git a/logos/crans.png b/logos/crans.png deleted file mode 100644 index 9c5e281a..00000000 Binary files a/logos/crans.png and /dev/null differ diff --git a/plays/files/crans_icon_dark.svg b/plays/files/crans_icon_dark.svg new file mode 100644 index 00000000..8bb282a0 --- /dev/null +++ b/plays/files/crans_icon_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plays/files/crans_icon_white.svg b/plays/files/crans_icon_white.svg new file mode 100644 index 00000000..9e1388fc --- /dev/null +++ b/plays/files/crans_icon_white.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/plays/mailman.yml b/plays/mailman.yml index e04d61ec..dfaf888b 100755 --- a/plays/mailman.yml +++ b/plays/mailman.yml @@ -10,6 +10,10 @@ default_language: "fr" auth_basic: | "On n'aime pas les spambots, donc on a mis un mot de passe. Le login est Stop et le mot de passe est Spam."; + custom_logo: "crans_icon_dark.svg" + custom_logo_name: "crans.svg" + custom_logo_url: "https://www.crans.org/" + custom_logo_alt: "CRANS" spamassassin: "SpamAssassin_crans" smtphost: "smtp.adm.crans.org" mynetworks: ['138.231.0.0/16', '185.230.76.0/22', '2a0c:700:0::/40'] diff --git a/plays/monitoring.yml b/plays/monitoring.yml index 167561e8..79b0923d 100755 --- a/plays/monitoring.yml +++ b/plays/monitoring.yml @@ -25,6 +25,7 @@ grafana: root_url: https://grafana.crans.org + icon: crans_icon_white.svg ldap_base: 'dc=crans,dc=org' ldap_master_ipv4: '172.16.10.1' diff --git a/roles/grafana/files/grafana_icon.svg b/roles/grafana/files/grafana_icon.svg deleted file mode 100644 index 6ae1be6b..00000000 --- a/roles/grafana/files/grafana_icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 1d928719..5c1649ba 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -80,7 +80,7 @@ - name: Change grafana logo copy: - src: grafana_icon.svg + src: "{{ grafana.icon }}" dest: /usr/share/grafana/public/img/grafana_icon.svg owner: root group: root diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml index 53ae09de..467ef9f0 100644 --- a/roles/mailman/tasks/main.yml +++ b/roles/mailman/tasks/main.yml @@ -20,12 +20,12 @@ notify: Reload mailman # Fanciness -- name: Deploy crans logo +- name: Deploy custom logo copy: - src: ../../../logos/crans.png - dest: /usr/share/images/mailman/crans.png + src: "{{ mailman.custom_logo }}" + dest: "/usr/share/images/mailman/{{ mailman.custom_logo_name }}" -- name: Deploy crans logo +- name: Deploy custom logo template: src: usr/lib/mailman/Mailman/htmlformat.py.j2 dest: /usr/lib/mailman/Mailman/htmlformat.py diff --git a/roles/mailman/templates/usr/lib/mailman/Mailman/htmlformat.py.j2 b/roles/mailman/templates/usr/lib/mailman/Mailman/htmlformat.py.j2 index 146f9576..3f10f131 100644 --- a/roles/mailman/templates/usr/lib/mailman/Mailman/htmlformat.py.j2 +++ b/roles/mailman/templates/usr/lib/mailman/Mailman/htmlformat.py.j2 @@ -650,14 +650,14 @@ class DefinitionList(Container): from mm_cfg import MAILMAN_URL PYTHON_URL = 'http://www.python.org/' GNU_URL = 'http://www.gnu.org/' -CRANS_URL = 'http://www.crans.org/' +CUSTOM_URL = '{{ mailman.custom_logo_url }}' # The names of the image logo files. These are concatentated onto # mm_cfg.IMAGE_LOGOS (not urljoined). DELIVERED_BY = 'mailman.jpg' PYTHON_POWERED = 'PythonPowered.png' GNU_HEAD = 'gnu-head-tiny.jpg' -CRANS_LOGO = 'crans.png' +CUSTOM_LOGO = '{{ mailman.custom_logo_name }}' def MailmanLogo(): @@ -667,7 +667,7 @@ def MailmanLogo(): mmlink = _("Delivered by Mailman") pylink = _("Python Powered") gnulink = _("GNU's Not Unix") - cranslink = _("CRANS") + customlink = _("{{ mailman.custom_logo_alt }}") if mm_cfg.SITE_LINK: sitelink = mm_cfg.SITE_TEXT @@ -678,15 +678,15 @@ def MailmanLogo(): mmlink = logo(DELIVERED_BY, mmlink) pylink = logo(PYTHON_POWERED, pylink) gnulink = logo(GNU_HEAD, gnulink) - cranslink = logo(CRANS_LOGO, cranslink) + customlink = logo(CUSTOM_LOGO, customlink) if mm_cfg.SITE_LINK: sitelink = logo(mm_cfg.SITE_LOGO, sitelink, "") mmlink = Link(MAILMAN_URL, mmlink + _('
version %(version)s')) pylink = Link(PYTHON_URL, pylink) gnulink = Link(GNU_URL, gnulink) - cranslink = Link(CRANS_URL, cranslink) - links = [mmlink, pylink, gnulink, cranslink] + customlink = Link(CUSTOM_URL, customlink) + links = [mmlink, pylink, gnulink, customlink] if mm_cfg.SITE_LINK: if mm_cfg.SITE_URL: sitelink = Link(mm_cfg.SITE_URL, sitelink)