[redisdead] Replace very old crans logo and remove all crans-specific options in the config template
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>certbot_on_virtu
parent
4507d367bd
commit
b9f0bbb460
BIN
logos/crans.png
BIN
logos/crans.png
Binary file not shown.
Before Width: | Height: | Size: 10 KiB |
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 14 KiB |
|
@ -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']
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 + _('<br>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)
|
||||
|
|
Loading…
Reference in New Issue