Commit 36e62880 authored by Jérome Perrin's avatar Jérome Perrin

Fix local font directory for cloudooo

Even though there is no integrated way of putting for fonts there, cloudooo supports additional fonts in `~/srv/font`

This was not working because of a leading space in the fontconfig

See merge request nexedi/slapos!966
parents 7fb84f78 64649ce0
[template-fonts-conf]
filename = fonts.conf.in
md5sum = 6967e553630d107fc0a59b14de8b0251
md5sum = a31030785c7b54bfd33320c87f6b5699
......@@ -14,10 +14,14 @@
#}
<fontconfig>
<cachedir>{{ cachedir | escape}}</cachedir>
{% for font in fonts.splitlines() -%}
<dir>{{ font | escape}}</dir>
{% endfor %}
{% for include in includes.splitlines() -%}
<include>{{ include | escape}}</include>
{% endfor %}
</fontconfig>
\ No newline at end of file
{%- for font in fonts.splitlines() -%}
{% if font.strip() %}
<dir>{{ font.strip() | escape}}</dir>
{%- endif %}
{%- endfor %}
{%- for include in includes.splitlines() -%}
{% if include.strip() %}
<include>{{ include.strip() | escape}}</include>
{%- endif %}
{%- endfor %}
</fontconfig>
......@@ -18,4 +18,4 @@ md5sum = e986de01a57161b32425f1cd3ccac924
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
md5sum = f2b05132cee3a012c3a41b904565204b
md5sum = 9e1a66cf18d7c30c14afeb66c20afb46
......@@ -147,7 +147,7 @@ context =
key includes :includes
fonts =
{% for font in parameter_dict['fonts'].splitlines() %}
{{ font }}
{{ font }}
{% endfor%}
${directory:font}
includes =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment