software/erp5: switch to new $FONTCONFIG_FILE

stack/erp5/buildout.cfg

@@ -71,13 +71,6 @@ parts +=
   testrunner
   test_suite_runner
 
-# fonts
-  liberation-fonts
-  ipaex-fonts
-  ipa-fonts
-  ocrb-fonts
-  android-fonts
-
 # get git repositories
   genbt5list
 
@@ -170,6 +163,8 @@ mode = 640
 context =
     key mariadb_link_binary template-mariadb:link-binary
     key zope_link_binary template-zope:link-binary
+    key zope_fonts template-zope:fonts
+    key zope_fontconfig_includes template-zope:fontconfig-includes
     key apache_location apache:location
     key bin_directory buildout:bin-directory
     key buildout_bin_directory buildout:bin-directory
@@ -224,6 +219,7 @@ context =
     key template_zeo template-zeo:target
     key template_zope template-zope:target
     key template_zope_conf template-zope-conf:target
+    key template_fonts_conf template-fonts-conf:output
     key userhosts_location userhosts:location
     key unixodbc_location unixodbc:location
     key wget_location wget:location
@@ -256,6 +252,15 @@ link-binary =
   ${sed:location}/bin/sed
   ${tesseract:location}/bin/tesseract
   ${w3m:location}/bin/w3m
+fonts =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+  ${ipa-fonts:location}
+  ${ocrb-fonts:location}
+  ${android-fonts:location}
+fontconfig-includes =
+  ${fontconfig:location}/etc/fonts/conf.d
+
 
 [template-balancer]
 <= download-base

stack/erp5/buildout.hash.cfg

@@ -70,7 +70,7 @@ md5sum = cc19560b9400cecbd23064d55c501eec
 
 [template]
 filename = instance.cfg.in
-md5sum = 1a218a5676208dda092e6045f25bf77f
+md5sum = 364178ea02b028f10feb9321beb5c7bb
 
 [monitor-template-dummy]
 filename = dummy.cfg
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e9032f39c6e5db684342491fdeb4624c
+md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -58,6 +58,7 @@ environment +=
   MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
   INSTANCE_HOME=${:instance-home}
   CAUCASE={{ slapparameter_dict['caucase-url'] }}
+  FONTCONFIG_FILE=${fontconfig-conf:rendered}
 {% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
   WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
 {% endif %}
@@ -88,6 +89,24 @@ tmp = ${buildout:directory}/tmp
 var = ${buildout:directory}/var
 plugin = ${:etc}/plugin
 unit-test-path = ${:srv}/test-instance/unit_test
+fontconfig-cache = ${buildout:directory}/.fontconfig
+
+[fontconfig-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-fonts-conf'] }}
+rendered = ${directory:etc}/fonts.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+    key includes :includes
+fonts =
+{% for font in parameter_dict['fonts'].splitlines() %}
+   {{ font }}
+{% endfor %}
+includes =
+{% for include in parameter_dict['fontconfig-includes'].splitlines() %}
+   {{ include }}
+{% endfor %}
 
 # Used for ERP5 resiliency or (more probably)
 # webrunner resiliency with erp5 inside.

stack/erp5/instance.cfg.in

@@ -99,6 +99,9 @@ perl_dbd_mariadb_path = {{ perl_dbd_mariadb_path }}
 dash = {{ dash_location }}
 jsl = {{ jsl_location }}
 link-binary = {{ dumps(zope_link_binary) }}
+fonts = {{ dumps(zope_fonts) }}
+fontconfig-includes = {{ dumps(zope_fontconfig_includes) }}
+template-fonts-conf = {{ dumps(template_fonts_conf) }}
 userhosts = {{ userhosts_location }}
 site-zcml = {{ site_zcml }}
 extra-path-list = {{ dumps(extra_path_list) }}