Commit a1ca3b01 authored by Jérome Perrin's avatar Jérome Perrin

cloudooo: remove font-url-list parameter

This violates "instanciation happens offline" rule and project which
initiated this need do not use it anymore.
parent 287a6201
...@@ -10,14 +10,6 @@ ...@@ -10,14 +10,6 @@
"default": 23000 "default": 23000
}] }]
}, },
"font-url-list": {
"description": "List of URLs from which fonts are to be downloaded",
"default": [],
"items": {
"type": "string"
},
"type": "array"
},
"backend-count": { "backend-count": {
"description": "Number of backend cloudooo instances", "description": "Number of backend cloudooo instances",
"default": 1, "default": 1,
......
...@@ -81,10 +81,7 @@ recipe = slapos.cookbook:fontconfig ...@@ -81,10 +81,7 @@ recipe = slapos.cookbook:fontconfig
conf-path = ${directory:etc}/font.conf conf-path = ${directory:etc}/font.conf
font-system-folder = {{ parameter_dict['fonts'] }} font-system-folder = {{ parameter_dict['fonts'] }}
font-folder = ${directory:font} font-folder = ${directory:font}
{# XXX: violates "instanciation happens offline" rule -#}
url-list = {{ slapparameter_dict.get('font-url-list', []) | join(' ') }}
service-folder = ${directory:services} service-folder = ${directory:services}
onetimedownload_path = {{ bin_directory }}/onetimedownload
[binary-link] [binary-link]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
......
...@@ -83,5 +83,5 @@ extra-context = ...@@ -83,5 +83,5 @@ extra-context =
[template-cloudooo] [template-cloudooo]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum = 2763ad422f2afb2edecd58e1933b7ae6 md5sum = 902b2e8a331c3473fb16f6d9ca51b340
mode = 640 mode = 640
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