diff --git a/software/erp5/instance-cloudooo-schema.json b/software/erp5/instance-cloudooo-schema.json index 648f8ee947ca2c034aa02eb1e9a96294e0da830a..36eb31ec998c5fd44d5cb83a5c225c70e756fd9c 100644 --- a/software/erp5/instance-cloudooo-schema.json +++ b/software/erp5/instance-cloudooo-schema.json @@ -8,14 +8,6 @@ }, { "description": "Start allocating ports at this value, going upward" }] - }, - "font-url-list": { - "description": "List of URLs from which fonts are to be downloaded", - "default": [], - "items": { - "type": "string" - }, - "type": "array" } } } diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index afb3da07bb550d5b597364f8110f5f317052ae0e..b3fda9f6501292ef11c21bac187ee943f66bdca6 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -177,7 +177,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940 [template-cloudooo] <= download-base filename = instance-cloudoo.cfg.in -md5sum = 1b515056c5892a86d4ece252ad114a97 +md5sum = 1eedc7ee93ac7c95e1c7d50a36ef2b01 [template-zope-conf] <= download-base @@ -616,7 +616,6 @@ eggs += scripts += is-local-tcp-port-opened is-process-older-than-dependency-set - onetimedownload zodbpack [versions] diff --git a/stack/erp5/instance-cloudoo.cfg.in b/stack/erp5/instance-cloudoo.cfg.in index 1b3acf13d141b983da1c53425d17b2950a660bc8..098dc176b5c16d06791631f75e3657227d7c726c 100644 --- a/stack/erp5/instance-cloudoo.cfg.in +++ b/stack/erp5/instance-cloudoo.cfg.in @@ -50,10 +50,7 @@ recipe = slapos.cookbook:fontconfig conf-path = ${directory:etc}/font.conf font-system-folder = {{ parameter_dict['fonts'] }} font-folder = ${directory:font} -{# XXX: violates "instanciation happens offline" rule -#} -url-list = {{ dumps(slapparameter_dict.get('font-url-list', []) | join(' ')) }} service-folder = ${directory:service} -onetimedownload_path = {{ bin_directory }}/onetimedownload [resiliency-exclude-file] # Generate rdiff exclude file in case of resiliency