diff --git a/software/cloudooo/instance-cloudoo-input-schema.json b/software/cloudooo/instance-cloudoo-input-schema.json index f838181b07746edcc6c4333318660230dfb98db0..ee4521a6d9e5f3108ff581fa7964d6d2b45c0df0 100644 --- a/software/cloudooo/instance-cloudoo-input-schema.json +++ b/software/cloudooo/instance-cloudoo-input-schema.json @@ -10,14 +10,6 @@ "default": 23000 }] }, - "font-url-list": { - "description": "List of URLs from which fonts are to be downloaded", - "default": [], - "items": { - "type": "string" - }, - "type": "array" - }, "backend-count": { "description": "Number of backend cloudooo instances", "default": 1, diff --git a/software/cloudooo/instance-cloudoo.cfg.in b/software/cloudooo/instance-cloudoo.cfg.in index 72a48e447466e2210867514954fce4b2d57bc83e..4117ff0968b7d2d73e563e6396cbaf17bb0f7d28 100644 --- a/software/cloudooo/instance-cloudoo.cfg.in +++ b/software/cloudooo/instance-cloudoo.cfg.in @@ -81,10 +81,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 = {{ slapparameter_dict.get('font-url-list', []) | join(' ') }} service-folder = ${directory:services} -onetimedownload_path = {{ bin_directory }}/onetimedownload [binary-link] recipe = slapos.cookbook:symbolic.link diff --git a/software/cloudooo/software.cfg b/software/cloudooo/software.cfg index 9835ebaaf804482cd85097bf7a9280593c8aebcf..f52c663669cbfff9984a89390a4e04675b72f66e 100644 --- a/software/cloudooo/software.cfg +++ b/software/cloudooo/software.cfg @@ -83,5 +83,5 @@ extra-context = [template-cloudooo] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/instance-cloudoo.cfg.in -md5sum = 2763ad422f2afb2edecd58e1933b7ae6 +md5sum = 902b2e8a331c3473fb16f6d9ca51b340 mode = 640